salmon-engine-projects/double-hit-balls
9
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Eigen release bug

Browse Source
This commit is contained in:
Emil Kabirov 2018-10-18 05:43:21 +05:00
parent a9f6a9be2b
commit dd87bbb116
4 changed files with 49 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
assets/effects/magic-stars-firework.json
View File

@ -4,7 +4,7 @@
{ {
"preloading": 4, "preloading": 4,
"texturePath": "textures/magic-star.png", "texturePath": "",
"textureSize": [ 22.625, 12.5 ], "textureSize": [ 22.625, 12.5 ],
"hasInertion": "false", "hasInertion": "false",
@ -24,7 +24,7 @@
}, },
{ {
"t": 1, "t": 1,
"value": 4 "value": 1
} }
] ]
}, },
@ -90,7 +90,7 @@
"maxParticles": 110, "maxParticles": 110,
"preloading": 110, "preloading": 110,
"texturePath": "textures/spark-white.png", "texturePath": "",
"textureSize": [ 10, 10 ], "textureSize": [ 10, 10 ],
"gravity": [0, -200, 0], "gravity": [0, -200, 0],
@ -109,7 +109,7 @@
}, },
{ {
"t": 1, "t": 1,
"value": 50 "value": 0
} }
] ]
}, },
@ -159,6 +159,7 @@
"color": "color":
{ {
"interpolation": "LINEAR_SPLINE", "interpolation": "LINEAR_SPLINE",
"matchDeathTime": "true",
"timeline": "timeline":
[ [
{ {
@ -202,7 +203,7 @@
}, },
{ {
"t": 2.000, "t": 2.000,
"value": 300 "value": 1
} }
] ]
}, },
@ -251,6 +252,7 @@
"color": "color":
{ {
"matchDeathTime": "true",
"interpolation": "LINEAR_SPLINE", "interpolation": "LINEAR_SPLINE",
"timeline": "timeline":
[ [
@ -264,7 +266,7 @@
}, },
{ {
"t": 1.200, "t": 1.200,
"value": [ 1, 0, 0, 0 ] "value": [ 1, 0, 0, 1 ]
} }
] ]
} }

11
game/gamecode.cpp
View File

@ -849,6 +849,8 @@ void TGameLevel::Draw()
void TGameLevel::InnerDraw(int screenWidth, int screenHeight, int matrixWidth, int matrixHeight, bool blackAndWhite) void TGameLevel::InnerDraw(int screenWidth, int screenHeight, int matrixWidth, int matrixHeight, bool blackAndWhite)
{ {
Application->EffectsDraw();
return;
// Scaling math // Scaling math
float tSW = Application->GetGameLevelScreenWidth(); // Screen Width float tSW = Application->GetGameLevelScreenWidth(); // Screen Width
float tSH = Application->GetGameLevelScreenHeight(); // Screen Height float tSH = Application->GetGameLevelScreenHeight(); // Screen Height
@ -1023,6 +1025,8 @@ void TGameLevel::InnerDraw(int screenWidth, int screenHeight, int matrixWidth, i
DrawBallInstancingList(blackAndWhite); DrawBallInstancingList(blackAndWhite);
Application->EffectsDraw();
Renderer->PopMatrix(); Renderer->PopMatrix();
@ -1033,8 +1037,6 @@ void TGameLevel::InnerDraw(int screenWidth, int screenHeight, int matrixWidth, i
iBonus->Draw(); iBonus->Draw();
} }
Application->EffectsDraw();
Renderer->PopShader(); Renderer->PopShader();
//float LEVEL_VIEWPORT_WIDTH = Application->GetGameLevelScreenWidth(); //float LEVEL_VIEWPORT_WIDTH = Application->GetGameLevelScreenWidth();
@ -1823,6 +1825,11 @@ void TGameLevel::OnTapDown(Vector2f pos)
float xPos = pos(0) - xOffset; float xPos = pos(0) - xOffset;
float yPos = pos(1) - yOffset; float yPos = pos(1) - yOffset;
Application->hitSpark("left", { xPos, yPos });
Application->fireworkEffect();
return;
if (LevelState == CONST_LEVELSTATE_STANDBY) if (LevelState == CONST_LEVELSTATE_STANDBY)
{ {
if (TapInBackBtnArea({ xPos, yPos })) if (TapInBackBtnArea({ xPos, yPos }))

60
game/main_code.cpp
View File

@ -142,8 +142,8 @@ void TMyApplication::InnerInit()
#ifdef TARGET_WIN32 #ifdef TARGET_WIN32
#ifdef NDEBUG #ifdef NDEBUG
ST::PathToResources = "resources/"; //ST::PathToResources = "resources/";
//ST::PathToResources = "../../../assets/"; ST::PathToResources = "../../../assets/";
#else #else
ST::PathToResources = "../../../assets/"; ST::PathToResources = "../../../assets/";
#endif #endif
@ -855,26 +855,26 @@ void TMyApplication::EffectsInit() {
std::string effectJSON; std::string effectJSON;
// LEFT // LEFT
effectJSON = JSONconfig.get<std::string>("lefteffect"); //effectJSON = JSONconfig.get<std::string>("lefteffect");
//boost::property_tree::json_parser::read_json(ST::PathToResources + effectJSON, JSONsource); ////boost::property_tree::json_parser::read_json(ST::PathToResources + effectJSON, JSONsource);
JSONsource = SE::ReadJsonFile(ST::PathToResources + effectJSON); // JSONsource = SE::ReadJsonFile(ST::PathToResources + effectJSON);
lsparkler.parse(JSONsource); // parse JSON //lsparkler.parse(JSONsource); // parse JSON
lsparkler.load(); // load textures //lsparkler.load(); // load textures
// RIGHT //// RIGHT
effectJSON = JSONconfig.get<std::string>("righteffect"); //effectJSON = JSONconfig.get<std::string>("righteffect");
JSONsource = SE::ReadJsonFile(ST::PathToResources + effectJSON); // JSONsource = SE::ReadJsonFile(ST::PathToResources + effectJSON);
rsparkler.parse(JSONsource); //rsparkler.parse(JSONsource);
rsparkler.load(); //rsparkler.load();
// TOP //// TOP
effectJSON = JSONconfig.get<std::string>("topeffect"); //effectJSON = JSONconfig.get<std::string>("topeffect");
JSONsource = SE::ReadJsonFile(ST::PathToResources + effectJSON); // JSONsource = SE::ReadJsonFile(ST::PathToResources + effectJSON);
tsparkler.parse(JSONsource); //tsparkler.parse(JSONsource);
tsparkler.load(); //tsparkler.load();
// BOTTOM //// BOTTOM
effectJSON = JSONconfig.get<std::string>("boteffect"); //effectJSON = JSONconfig.get<std::string>("boteffect");
JSONsource = SE::ReadJsonFile(ST::PathToResources + effectJSON); // JSONsource = SE::ReadJsonFile(ST::PathToResources + effectJSON);
bsparkler.parse(JSONsource); //bsparkler.parse(JSONsource);
bsparkler.load(); //bsparkler.load();
// Level finish // Level finish
effectJSON = JSONconfig.get<std::string>("lvlFinish"); effectJSON = JSONconfig.get<std::string>("lvlFinish");
JSONsource = SE::ReadJsonFile(ST::PathToResources + effectJSON); JSONsource = SE::ReadJsonFile(ST::PathToResources + effectJSON);
@ -892,10 +892,10 @@ void TMyApplication::EffectsInit() {
} }
void TMyApplication::EffectsUpdate(size_t dt) { void TMyApplication::EffectsUpdate(size_t dt) {
lsparkler.update(dt / 1000.f); //lsparkler.update(dt / 1000.f);
rsparkler.update(dt / 1000.f); //rsparkler.update(dt / 1000.f);
tsparkler.update(dt / 1000.f); //tsparkler.update(dt / 1000.f);
bsparkler.update(dt / 1000.f); //bsparkler.update(dt / 1000.f);
lvlFirework.update(dt / 1000.f); lvlFirework.update(dt / 1000.f);
} }
void TMyApplication::EffectsDraw() { void TMyApplication::EffectsDraw() {
@ -927,10 +927,10 @@ void TMyApplication::EffectsDraw() {
glEnable(GL_BLEND); glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
lsparkler.draw(); //lsparkler.draw();
rsparkler.draw(); //rsparkler.draw();
tsparkler.draw(); //tsparkler.draw();
bsparkler.draw(); //bsparkler.draw();
lvlFirework.draw(); lvlFirework.draw();
Renderer->PopMatrix(); Renderer->PopMatrix();

4
windows/DoubleHitBalls-win/DoubleHitBalls-win/DoubleHitBalls-win.vcxproj
View File

@ -110,7 +110,7 @@
</PrecompiledHeader> </PrecompiledHeader>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<PreprocessorDefinitions>TARGET_WIN32;DEBUG;_WIN32_WINNT=0x0501;EIGEN_DONT_ALIGN_STATICALLY;_WINDOWS;WIN32;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>TARGET_WIN32;DEBUG;_WIN32_WINNT=0x0501;_DISABLE_EXTENDED_ALIGNED_STORAGE;EIGEN_DONT_ALIGN_STATICALLY;_WINDOWS;WIN32;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>../../../game;../../../../tes-engine;../../../../../boost_1_67_0;../../../../eigen;../../../../boost_1_67_0;../../../../boost_1_67_0/bin.v2/libs/system/build/msvc-14.1/debug/address-model-64/link-static/threading-multi;../../../../boost_1_67_0/bin.v2/libs/date_time/build/msvc-14.1/debug/address-model-64/link-static/threading-multi/;../../../../boost_1_67_0/bin.v2/libs/regex/build/msvc-14.1/debug/address-model-64/link-static/threading-multi;../../../../boost_1_67_0/bin.v2/libs/thread/build/msvc-14.1/debug/address-model-64/link-static/threading-multi;../../../../boost_1_67_0/bin.v2/libs/chrono/build/msvc-14.1/debug/address-model-64/link-static/threading-multi;../../../../boost_1_67_0/bin.v2/libs/signals/build/msvc-14.1/debug/address-model-64/link-static/threading-multi;../../../../libs/boost-gil-extension;../../../../libs/jpeg-9;../../../../libs/jpeg-9/vc10;../../../../libs/lpng1510</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>../../../game;../../../../tes-engine;../../../../../boost_1_67_0;../../../../eigen;../../../../boost_1_67_0;../../../../boost_1_67_0/bin.v2/libs/system/build/msvc-14.1/debug/address-model-64/link-static/threading-multi;../../../../boost_1_67_0/bin.v2/libs/date_time/build/msvc-14.1/debug/address-model-64/link-static/threading-multi/;../../../../boost_1_67_0/bin.v2/libs/regex/build/msvc-14.1/debug/address-model-64/link-static/threading-multi;../../../../boost_1_67_0/bin.v2/libs/thread/build/msvc-14.1/debug/address-model-64/link-static/threading-multi;../../../../boost_1_67_0/bin.v2/libs/chrono/build/msvc-14.1/debug/address-model-64/link-static/threading-multi;../../../../boost_1_67_0/bin.v2/libs/signals/build/msvc-14.1/debug/address-model-64/link-static/threading-multi;../../../../libs/boost-gil-extension;../../../../libs/jpeg-9;../../../../libs/jpeg-9/vc10;../../../../libs/lpng1510</AdditionalIncludeDirectories>
<DisableSpecificWarnings>4503</DisableSpecificWarnings> <DisableSpecificWarnings>4503</DisableSpecificWarnings>
</ClCompile> </ClCompile>
@ -150,7 +150,7 @@
<Optimization>MaxSpeed</Optimization> <Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking> <FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions> <IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;TARGET_WIN32;_WIN32_WINNT=0x0501;WIN32_LEAN_AND_MEAN;EIGEN_DONT_ALIGN_STATICALLY;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;TARGET_WIN32;_WIN32_WINNT=0x0501;WIN32_LEAN_AND_MEAN;_DISABLE_EXTENDED_ALIGNED_STORAGE;EIGEN_DONT_ALIGN_STATICALLY;EIGEN_DONT_VECTORIZE;EIGEN_DISABLE_UNALIGNED_ARRAY_ASSERT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>../../../game;../../../../tes-engine;../../../../eigen;../../../../boost_1_67_0/;../../../../libs/boost-gil-extension;../../../../libs/jpeg-9;../../../../libs/jpeg-9/vc10;../../../../libs/lpng1510</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>../../../game;../../../../tes-engine;../../../../eigen;../../../../boost_1_67_0/;../../../../libs/boost-gil-extension;../../../../libs/jpeg-9;../../../../libs/jpeg-9/vc10;../../../../libs/lpng1510</AdditionalIncludeDirectories>
<DisableSpecificWarnings>4503</DisableSpecificWarnings> <DisableSpecificWarnings>4503</DisableSpecificWarnings>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>