diff --git a/assets/config.json b/assets/config.json new file mode 100755 index 0000000..7f5371e --- /dev/null +++ b/assets/config.json @@ -0,0 +1,3 @@ +{ + "effect": "effects/sparkler.json" +} \ No newline at end of file diff --git a/assets/test.json b/assets/effects/S-func.json similarity index 60% rename from assets/test.json rename to assets/effects/S-func.json index c881243..5a41e85 100755 --- a/assets/test.json +++ b/assets/effects/S-func.json @@ -8,17 +8,16 @@ "maxParticles": 300, "preloading": 100, - "texturePath": "spark.png", + "texturePath": "textures/spark.png", "hasInertion": "false", "gravity": [0, 0, 0], - "spawnRange_system": "PARTICLE_BIRTH", + "spawnRange_system": "PARTICLE_EFFECT", "spawnTotal": { "interpolation": "LINEAR_SPLINE", - "isLooped": "false", "timeline": [ { @@ -26,21 +25,21 @@ "value": 0 }, { - "t": 10, - "value": 1000 + "t": 1, + "value": 5 } ] }, "spawnRange": { - "value": [ 90, 0, 0, 360 ] + "value": [ 0, 0, 0, 0 ] }, "lifeTime": { - "min": 0.1, - "max": 0.3 + "min": 2, + "max": 2 }, "coords_system": "PARTICLE_EFFECT", @@ -49,17 +48,28 @@ "coords": { - "interpolation": "LINEAR_SPLINE", - "isLooped": "false", + "interpolation": "CUBIC_SPLINE", "timeline": [ { "t": 0.000, - "value": [ 0, 0, 0 ] + "value": [ 0, 0, 0] + }, + { + "t": 0.500, + "value": [ 50, 20, 0] }, { "t": 1.000, - "value": [ 0, 0, 400 ] + "value": [ 100, 150, 0] + }, + { + "t": 1.500, + "value": [ 150, 280, 0] + }, + { + "t": 2, + "value": [ 200, 300, 0] } ] }, @@ -72,11 +82,10 @@ "scale": { "interpolation": "DISCRETE", - "isLooped": "false", "timeline": [ { - "value": [ 20, 20 ] + "value": [ 10, 10 ] } ] }, diff --git a/assets/effects/magic-stars.json b/assets/effects/magic-stars.json new file mode 100755 index 0000000..f5256be --- /dev/null +++ b/assets/effects/magic-stars.json @@ -0,0 +1,88 @@ +{ + "name": "Sparkler - бенгальский огонь", + + "emitters": + [ + { + "name": "Spark", + + "maxParticles": 300, + "preloading": 100, + "texturePath": "textures/magic-star.png", + + "hasInertion": "false", + "gravity": [0, 0, 0], + + "spawnRange_system": "PARTICLE_EFFECT", + + "spawnTotal": + { + "interpolation": "LINEAR_SPLINE", + "timeline": + [ + { + "t": 0, + "value": 0 + }, + { + "t": 1, + "value": 1 + } + ] + }, + + "spawnRange": + { + "value": [ 0, 45, 0, 45 ] + }, + + "lifeTime": + { + "min": 1.5, + "max": 2.5 + }, + + "coords_system": "PARTICLE_BIRTH", + "coords_axis_system": "PARTICLE_BIRTH", + "rotation_system": "PARTICLE_BIRTH", + + "coords": + { + "interpolation": "LINEAR_SPLINE", + "timeline": + [ + { + "t": 0.000, + "value": [ 0, 0, 0 ] + }, + { + "t": 2.000, + "min": [ 400, 0, 0 ], + "max": [ 400, 0, 0 ] + } + ] + }, + + "rotation": + { + "value": [ 0, 0, 0 ] + }, + + "scale": + { + "interpolation": "DISCRETE", + "timeline": + [ + { + "value": [ 22.625, 12.5 ] + } + ] + }, + + "color": + { + "value": [ 1, 1, 1, 1 ] + } + } + ] +} \ No newline at end of file diff --git a/assets/effects/sine-comets.json b/assets/effects/sine-comets.json new file mode 100755 index 0000000..d29eeb8 --- /dev/null +++ b/assets/effects/sine-comets.json @@ -0,0 +1,115 @@ +{ + "name": "Sparkler - бенгальский огонь", + + "emitters": + [ + { + "name": "Spark", + + "maxParticles": 300, + "preloading": 100, + "texturePath": "textures/comet.png", + + "hasInertion": "false", + "gravity": [0, 0, 0], + + "spawnRange_system": "PARTICLE_EFFECT", + + "spawnTotal": + { + "interpolation": "LINEAR_SPLINE", + "timeline": + [ + { + "t": 0, + "value": 0 + }, + { + "t": 1, + "value": 3 + } + ] + }, + + "spawnRange": + { + "value": [ 0, 0, 0, 0 ] + }, + + "lifeTime": + { + "min": 6, + "max": 6 + }, + + "coords_system": "PARTICLE_EFFECT", + "coords_axis_system": "PARTICLE_BIRTH", + "rotation_system": "PARTICLE_ITSELF", + + "coords": + { + "interpolation": "CUBIC_SPLINE", + "timeline": + [ + { + "t": 0.000, + "value": [ 50, 0, 0 ] + }, + { + "t": 0.001, + "value": [ 50, 0, 0 ] + }, + { + "t": 1.000, + "value": [ 100, 100, 0 ] + }, + { + "t": 2.000, + "value": [ 200, -100, 0 ] + }, + { + "t": 3.000, + "value": [ 300, 100, 0 ] + }, + { + "t": 4.000, + "value": [ 400, -100, 0 ] + }, + { + "t": 5.000, + "value": [ 500, 100, 0 ] + }, + { + "t": 5.999, + "value": [ 600, -100, 0 ] + }, + { + "t": 6.000, + "value": [ 600, -100, 0 ] + } + ] + }, + + "rotation": + { + "value": [ 0, 0, 0 ] + }, + + "scale": + { + "interpolation": "DISCRETE", + "timeline": + [ + { + "value": [ 20, 7.12 ] + } + ] + }, + + "color": + { + "value": [ 1, 1, 1, 1 ] + } + } + ] +} \ No newline at end of file diff --git a/assets/effects/sine-sparks.json b/assets/effects/sine-sparks.json new file mode 100755 index 0000000..0f1686b --- /dev/null +++ b/assets/effects/sine-sparks.json @@ -0,0 +1,115 @@ +{ + "name": "Sparkler - бенгальский огонь", + + "emitters": + [ + { + "name": "Spark", + + "maxParticles": 300, + "preloading": 100, + "texturePath": "textures/spark.png", + + "hasInertion": "false", + "gravity": [0, 0, 0], + + "spawnRange_system": "PARTICLE_EFFECT", + + "spawnTotal": + { + "interpolation": "LINEAR_SPLINE", + "timeline": + [ + { + "t": 0, + "value": 0 + }, + { + "t": 1, + "value": 20 + } + ] + }, + + "spawnRange": + { + "value": [ 0, 0, 0, 0 ] + }, + + "lifeTime": + { + "min": 6, + "max": 6 + }, + + "coords_system": "PARTICLE_EFFECT", + "coords_axis_system": "PARTICLE_BIRTH", + "rotation_system": "PARTICLE_EFFECT", + + "coords": + { + "interpolation": "CUBIC_SPLINE", + "timeline": + [ + { + "t": 0.000, + "value": [ 50, 0, 0 ] + }, + { + "t": 0.001, + "value": [ 50, 0, 0 ] + }, + { + "t": 1.000, + "value": [ 100, 100, 0 ] + }, + { + "t": 2.000, + "value": [ 200, -100, 0 ] + }, + { + "t": 3.000, + "value": [ 300, 100, 0 ] + }, + { + "t": 4.000, + "value": [ 400, -100, 0 ] + }, + { + "t": 5.000, + "value": [ 500, 100, 0 ] + }, + { + "t": 5.999, + "value": [ 600, -100, 0 ] + }, + { + "t": 6.000, + "value": [ 600, -100, 0 ] + } + ] + }, + + "rotation": + { + "value": [ 0, 0, 0 ] + }, + + "scale": + { + "interpolation": "DISCRETE", + "timeline": + [ + { + "value": [ 10, 10 ] + } + ] + }, + + "color": + { + "value": [ 1, 1, 0, 1 ] + } + } + ] +} \ No newline at end of file diff --git a/assets/effects/sparkler.json b/assets/effects/sparkler.json new file mode 100755 index 0000000..b81709c --- /dev/null +++ b/assets/effects/sparkler.json @@ -0,0 +1,89 @@ +{ + "name": "Simple Sparkler", + + "emitters": + [ + { + "name": "Spark", + + "maxParticles": 1000, + "preloading": 1000, + "texturePath": "textures/spark-white.png", + + "hasInertion": "false", + "gravity": [0, 0, 0], + + "spawnRange_system": "PARTICLE_EFFECT", + + "spawnTotal": + { + "interpolation": "LINEAR_SPLINE", + "timelineType": "CONTINUED", + "timeline": + [ + { + "t": 0.000, + "value": 0 + }, + { + "t": 1.000, + "value": 200 + } + ] + }, + + "spawnRange": + { + "value": [ 0, 0, 0, 360 ] + }, + + "lifeTime": + { + "min": 0.1, + "max": 1 + }, + + "coords_system": "PARTICLE_BIRTH", + "coords_axis_system": "PARTICLE_BIRTH", + "rotation_system": "PARTICLE_EFFECT", + + "coords": + { + "interpolation": "LINEAR_SPLINE", + "timeline": + [ + { + "t": 0.000, + "value": [ 0, 0, 0 ] + }, + { + "t": 1, + "min": [ 300, 0, 0 ], + "max": [ 600, 0, 0 ] + } + ] + }, + + "rotation": + { + "value": [ 0, 0, 0 ] + }, + + "scale": + { + "interpolation": "DISCRETE", + "timeline": + [ + { + "value": [ 10, 10 ] + } + ] + }, + + "color": + { + "value": [ 1, 1, 0, 1 ] + } + } + ] +} \ No newline at end of file diff --git a/assets/effects/test.json b/assets/effects/test.json new file mode 100755 index 0000000..92c03cd --- /dev/null +++ b/assets/effects/test.json @@ -0,0 +1,97 @@ +{ + "name": "Simple Sparkler", + + "emitters": + [ + { + "name": "Spark", + + "maxParticles": 1000, + "preloading": 1000, + "texturePath": "textures/spark-white.png", + + "hasInertion": "false", + "gravity": [0, 0, 0], + + "spawnRange_system": "PARTICLE_EFFECT", + + "spawnTotal": + { + "interpolation": "CUBIC_SPLINE", + "timelineType": "LIMITED", + "timeline": + [ + { + "t": 0.000, + "value": 0 + }, + { + "t": 0.010, + "value": 0 + }, + { + "t": 9.990, + "value": 2000 + }, + { + "t": 10.000, + "value": 2000 + } + ] + }, + + "spawnRange": + { + "value": [ 0, 0, 0, 360 ] + }, + + "lifeTime": + { + "min": 0.1, + "max": 1 + }, + + "coords_system": "PARTICLE_BIRTH", + "coords_axis_system": "PARTICLE_BIRTH", + "rotation_system": "PARTICLE_EFFECT", + + "coords": + { + "interpolation": "LINEAR_SPLINE", + "timeline": + [ + { + "t": 0.000, + "value": [ 0, 0, 0 ] + }, + { + "t": 1, + "min": [ 300, 0, 0 ], + "max": [ 600, 0, 0 ] + } + ] + }, + + "rotation": + { + "value": [ 0, 0, 0 ] + }, + + "scale": + { + "interpolation": "DISCRETE", + "timeline": + [ + { + "value": [ 10, 10 ] + } + ] + }, + + "color": + { + "value": [ 1, 1, 0, 1 ] + } + } + ] +} \ No newline at end of file diff --git a/assets/particle-shader.fragment b/assets/particle-shader.fragment deleted file mode 100755 index 47d8a90..0000000 --- a/assets/particle-shader.fragment +++ /dev/null @@ -1,11 +0,0 @@ -precision mediump float; - -varying vec2 texCoord; - -uniform sampler2D Texture; -uniform vec4 Color; - -void main() -{ - gl_FragColor = texture2D(Texture,texCoord) * Color; -} \ No newline at end of file diff --git a/assets/color-shader.fragment b/assets/shaders/color-shader.fragment similarity index 100% rename from assets/color-shader.fragment rename to assets/shaders/color-shader.fragment diff --git a/assets/color-shader.vertex b/assets/shaders/color-shader.vertex similarity index 100% rename from assets/color-shader.vertex rename to assets/shaders/color-shader.vertex diff --git a/assets/shaders/particle-shader.fragment b/assets/shaders/particle-shader.fragment new file mode 100755 index 0000000..b4a6521 --- /dev/null +++ b/assets/shaders/particle-shader.fragment @@ -0,0 +1,11 @@ +precision mediump float; + +in vec2 texCoord; +flat in vec4 color; + +uniform sampler2D Texture; + +void main() +{ + gl_FragColor = texture2D(Texture,texCoord) * color; +} \ No newline at end of file diff --git a/assets/particle-shader.vertex b/assets/shaders/particle-shader.vertex similarity index 65% rename from assets/particle-shader.vertex rename to assets/shaders/particle-shader.vertex index db9ad25..f9a7261 100755 --- a/assets/particle-shader.vertex +++ b/assets/shaders/particle-shader.vertex @@ -1,7 +1,9 @@ attribute vec3 vPosition; attribute vec2 vTexCoord; +attribute vec4 vColor; -varying vec2 texCoord; +out vec2 texCoord; +flat out vec4 color; uniform mat4 ProjectionMatrix; @@ -9,4 +11,5 @@ void main() { gl_Position = ProjectionMatrix * vec4(vPosition.xyz, 1.0); texCoord = vTexCoord; + color = vColor; } \ No newline at end of file diff --git a/assets/texture-shader.fragment b/assets/shaders/texture-shader.fragment similarity index 100% rename from assets/texture-shader.fragment rename to assets/shaders/texture-shader.fragment diff --git a/assets/texture-shader.vertex b/assets/shaders/texture-shader.vertex similarity index 100% rename from assets/texture-shader.vertex rename to assets/shaders/texture-shader.vertex diff --git a/assets/sparkler.json b/assets/sparkler.json deleted file mode 100755 index e33d6ee..0000000 --- a/assets/sparkler.json +++ /dev/null @@ -1,100 +0,0 @@ -{ - "name": "Sparkler - бенгальский огонь", - - "emitters": - [ - { - "name": "Spark", - - "maxParticles": 300, - "preloading": 100, - "texturePath": "spark.png", - - "hasInertion": "false", - "gravity": [0, -2, 0], - - "spawnRange_system": "PARTICLE_BIRTH", - - "spawnTotal": - { - "interpolation": "LINEAR_SPLINE", - "isLooped": "false", - "timeline": - [ - { - "t": 0.000, - "value": 0 - }, - { - "t": 0.001, - "value": 0 - }, - { - "t": 9.999, - "value": 300 - }, - { - "t": 10.000, - "value": 300 - } - ] - }, - - "spawnRange": - { - "value": [ 0, 0, 360, 180 ] - }, - - "lifeTime": - { - "min": 0.100, - "max": 1.000 - }, - - "coords_system": "PARTICLE_BIRTH", - "coords_axis_system": "PARTICLE_EFFECT", - "rotation_system": "PARTICLE_BIRTH", - - "coords": - { - "interpolation": "CUBIC_SPLINE", - "isLooped": "false", - "timeline": - [ - { - "t": 0.000, - "min": [ -1, -1, -1 ], - "max": [ 1, 1, 1 ] - }, - { - "t": 1.000, - "min": [ -2, -2, -2 ], - "max": [ 2, 2, 2 ] - } - ] - }, - - "rotation": - { - "value": [ 0, 0, 0 ] - }, - - "scale": - { - "interpolation": "DISCRETE", - "isLooped": "false", - "timeline": - [ - { - "value": [ 5, 5 ] - } - ] - }, - - "color": - { - "value": [ 1, 1, 0, 1 ] - } - } - ] -} \ No newline at end of file diff --git a/assets/textures/comet-white.png b/assets/textures/comet-white.png new file mode 100755 index 0000000..1ee1203 Binary files /dev/null and b/assets/textures/comet-white.png differ diff --git a/assets/textures/comet.png b/assets/textures/comet.png new file mode 100755 index 0000000..e6b6f8f Binary files /dev/null and b/assets/textures/comet.png differ diff --git a/assets/textures/magic-star-big.png b/assets/textures/magic-star-big.png new file mode 100755 index 0000000..a6acd45 Binary files /dev/null and b/assets/textures/magic-star-big.png differ diff --git a/assets/textures/magic-star.png b/assets/textures/magic-star.png new file mode 100755 index 0000000..218f96d Binary files /dev/null and b/assets/textures/magic-star.png differ diff --git a/assets/textures/spark-white.png b/assets/textures/spark-white.png new file mode 100755 index 0000000..8444c1b Binary files /dev/null and b/assets/textures/spark-white.png differ diff --git a/assets/spark.png b/assets/textures/spark.png similarity index 61% rename from assets/spark.png rename to assets/textures/spark.png index ad4b3b1..f726477 100755 Binary files a/assets/spark.png and b/assets/textures/spark.png differ diff --git a/assets/textures/star-with-tail-big.png b/assets/textures/star-with-tail-big.png new file mode 100755 index 0000000..630ad9c Binary files /dev/null and b/assets/textures/star-with-tail-big.png differ diff --git a/assets/textures/star-with-tail-white.png b/assets/textures/star-with-tail-white.png new file mode 100755 index 0000000..093b747 Binary files /dev/null and b/assets/textures/star-with-tail-white.png differ diff --git a/assets/textures/star-with-tail.png b/assets/textures/star-with-tail.png new file mode 100755 index 0000000..189781e Binary files /dev/null and b/assets/textures/star-with-tail.png differ diff --git a/game/main_code.cpp b/game/main_code.cpp index 160cdde..6f779e0 100644 --- a/game/main_code.cpp +++ b/game/main_code.cpp @@ -19,7 +19,7 @@ void TMyApplication::InnerInit() #ifdef TARGET_WIN32 #ifdef NDEBUG - ST::PathToResources = "resources/"; + ST::PathToResources = "../../../assets/"; #else ST::PathToResources = "../../../assets/"; #endif @@ -35,20 +35,25 @@ void TMyApplication::InnerInit() } srand (static_cast(time(NULL))); - ResourceManager->ShaderManager.AddShader("DefaultShader", "texture-shader.vertex", "texture-shader.fragment"); - ResourceManager->ShaderManager.AddShader("ColorShader", "color-shader.vertex", "color-shader.fragment"); - ResourceManager->ShaderManager.AddShader(ParticleEffect::PARTICLE_SHADER, "particle-shader.vertex", "particle-shader.fragment"); + ResourceManager->ShaderManager.AddShader("DefaultShader", "shaders/texture-shader.vertex", "shaders/texture-shader.fragment"); + ResourceManager->ShaderManager.AddShader("ColorShader", "shaders/color-shader.vertex", "shaders/color-shader.fragment"); + ResourceManager->ShaderManager.AddShader(ParticleEffect::PARTICLE_SHADER, "shaders/particle-shader.vertex", "shaders/particle-shader.fragment"); Renderer->PushShader("ColorShader"); float width = Renderer->GetScreenWidth(); float height = Renderer->GetScreenHeight(); Renderer->SetOrthoProjection(); - Renderer->PushProjectionMatrix(width, height, -1, 1); + Renderer->PushProjectionMatrix(width, height, -500, 500); //Renderer->SetFullScreenViewport(); boost::property_tree::ptree JSONsource; - boost::property_tree::json_parser::read_json(ST::PathToResources + "test.json", JSONsource); + + boost::property_tree::json_parser::read_json(ST::PathToResources + "config.json", JSONsource); + + std::string effectJSON = JSONsource.get("effect"); + + boost::property_tree::json_parser::read_json(ST::PathToResources + effectJSON, JSONsource); sparkler.parse(JSONsource); // parse JSON @@ -61,14 +66,20 @@ void TMyApplication::InnerDeinit() { } +bool ignoreMove = false; + void TMyApplication::InnerOnMouseDown(TMouseState& mouseState) { + ignoreMove = false; + if (mouseState.LeftButtonPressed) { - sparkler.setCoords({ (float)mouseState.X, (float)mouseState.Y, 0 }); + sparkler.setCoords({ (float)mouseState.X, Renderer->GetScreenHeight() - (float)mouseState.Y, 0 }); } else if (mouseState.RightButtonPressed) { + ignoreMove = true; + if (sparkler.isSpawning()) { sparkler.stopSpawn(); @@ -82,6 +93,11 @@ void TMyApplication::InnerOnMouseDown(TMouseState& mouseState) void TMyApplication::InnerOnMove(Vector2f p, Vector2f shift) { + if (ignoreMove) + { + return; + } + sparkler.setCoords({ p[0], p[1], 0 }); } diff --git a/windows/DoubleHitBalls-win/DoubleHitBalls-win/DoubleHitBalls-win.vcxproj b/windows/DoubleHitBalls-win/DoubleHitBalls-win/DoubleHitBalls-win.vcxproj index c92d6ae..13f9c33 100755 --- a/windows/DoubleHitBalls-win/DoubleHitBalls-win/DoubleHitBalls-win.vcxproj +++ b/windows/DoubleHitBalls-win/DoubleHitBalls-win/DoubleHitBalls-win.vcxproj @@ -152,13 +152,14 @@ WIN32;NDEBUG;_WINDOWS;TARGET_WIN32;_WIN32_WINNT=0x0501;WIN32_LEAN_AND_MEAN;EIGEN_DONT_ALIGN_STATICALLY;%(PreprocessorDefinitions) ../../../game;../../../../tes-engine;../../../../eigen;../../../../boost_1_63_0/;../../../../boost_1_63_0/bin.v2/libs/system/build/msvc-14.0/release/address-model-64/link-static/threading-multi;../../../../boost_1_63_0/bin.v2/libs/date_time/build/msvc-14.0/release/address-model-64/link-static/threading-multi/;../../../../boost_1_63_0/bin.v2/libs/regex/build/msvc-14.0/release/address-model-64/link-static/threading-multi;../../../../boost_1_63_0/bin.v2/libs/thread/build/msvc-14.0/release/address-model-64/link-static/threading-multi;../../../../boost_1_63_0/bin.v2/libs/chrono/build/msvc-14.0/release/address-model-64/link-static/threading-multi;../../../../boost_1_63_0/bin.v2/libs/signals/build/msvc-14.0/release/address-model-64/link-static/threading-multi;../../../../libs/boost-gil-extension;../../../../libs/jpeg-9;../../../../libs/jpeg-9/vc10;../../../../libs/lpng1510 4503 + MultiThreadedDLL Windows true true true - ../../../game;../../../../tes-engine;../../../../eigen;../../../../boost_1_63_0/;../../../../boost_1_63_0/bin.v2/libs/system/build/msvc-14.0/release/address-model-64/link-static/threading-multi;../../../../boost_1_63_0/bin.v2/libs/date_time/build/msvc-14.0/release/address-model-64/link-static/threading-multi/;../../../../boost_1_63_0/bin.v2/libs/regex/build/msvc-14.0/release/address-model-64/link-static/threading-multi;../../../../boost_1_63_0/bin.v2/libs/thread/build/msvc-14.0/release/address-model-64/link-static/threading-multi;../../../../boost_1_63_0/bin.v2/libs/chrono/build/msvc-14.0/release/address-model-64/link-static/threading-multi;../../../../boost_1_63_0/bin.v2/libs/signals/build/msvc-14.0/release/address-model-64/link-static/threading-multi;../../../../libs/boost-gil-extension;../../../../libs/jpeg-9;../../../../libs/jpeg-9/vc10;../../../../libs/lpng1510;../x64/Release + ../../../game;../../../../tes-engine;../../../../eigen;../../../../boost_1_63_0/;../../../../boost_1_63_0/stage/x64/lib;../../../../boost_1_63_0/bin.v2/libs/system/build/msvc-14.0/release/address-model-64/link-static/threading-multi;../../../../boost_1_63_0/bin.v2/libs/date_time/build/msvc-14.0/release/address-model-64/link-static/threading-multi/;../../../../boost_1_63_0/bin.v2/libs/regex/build/msvc-14.0/release/address-model-64/link-static/threading-multi;../../../../boost_1_63_0/bin.v2/libs/thread/build/msvc-14.0/release/address-model-64/link-static/threading-multi;../../../../boost_1_63_0/bin.v2/libs/chrono/build/msvc-14.0/release/address-model-64/link-static/threading-multi;../../../../boost_1_63_0/bin.v2/libs/signals/build/msvc-14.0/release/address-model-64/link-static/threading-multi;../../../../libs/boost-gil-extension;../../../../libs/jpeg-9;../../../../libs/jpeg-9/vc10;../../../../libs/lpng1510;../x64/Release libjpeg.lib;libpng.lib;Engine.lib;opengl32.lib;glu32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) diff --git a/windows/DoubleHitBalls-win/DoubleHitBalls-win/DoubleHitBalls-win.vcxproj.user b/windows/DoubleHitBalls-win/DoubleHitBalls-win/DoubleHitBalls-win.vcxproj.user new file mode 100755 index 0000000..6fb136b --- /dev/null +++ b/windows/DoubleHitBalls-win/DoubleHitBalls-win/DoubleHitBalls-win.vcxproj.user @@ -0,0 +1,4 @@ + + + + \ No newline at end of file