Eigen release bug

This commit is contained in:
emil.kabirov committed 2018-10-18 05:43:21 +05:00
1 parent a9f6a9be2b
commit dd87bbb116
4 files changed
+49 -40

No files matched your search

+9 -2
View File
@@ -849,6 +849,8 @@ void TGameLevel::Draw()
void TGameLevel::InnerDraw(int screenWidth, int screenHeight, int matrixWidth, int matrixHeight, bool blackAndWhite)
{
Application->EffectsDraw();
return;
// Scaling math
float tSW = Application->GetGameLevelScreenWidth(); // Screen Width
float tSH = Application->GetGameLevelScreenHeight(); // Screen Height
@@ -1023,6 +1025,8 @@ void TGameLevel::InnerDraw(int screenWidth, int screenHeight, int matrixWidth, i
DrawBallInstancingList(blackAndWhite);
Application->EffectsDraw();
Renderer->PopMatrix();
@@ -1032,8 +1036,6 @@ void TGameLevel::InnerDraw(int screenWidth, int screenHeight, int matrixWidth, i
{
iBonus->Draw();
}
Application->EffectsDraw();
Renderer->PopShader();
@@ -1823,6 +1825,11 @@ void TGameLevel::OnTapDown(Vector2f pos)
float xPos = pos(0) - xOffset;
float yPos = pos(1) - yOffset;
Application->hitSpark("left", { xPos, yPos });
Application->fireworkEffect();
return;
if (LevelState == CONST_LEVELSTATE_STANDBY)
{
if (TapInBackBtnArea({ xPos, yPos }))
+30 -30
View File
@@ -142,8 +142,8 @@ void TMyApplication::InnerInit()
#ifdef TARGET_WIN32
#ifdef NDEBUG
ST::PathToResources = "resources/";
//ST::PathToResources = "../../../assets/";
//ST::PathToResources = "resources/";
ST::PathToResources = "../../../assets/";
#else
ST::PathToResources = "../../../assets/";
#endif
@@ -855,26 +855,26 @@ void TMyApplication::EffectsInit() {
std::string effectJSON;
// LEFT
effectJSON = JSONconfig.get<std::string>("lefteffect");
//boost::property_tree::json_parser::read_json(ST::PathToResources + effectJSON, JSONsource);
JSONsource = SE::ReadJsonFile(ST::PathToResources + effectJSON);
lsparkler.parse(JSONsource); // parse JSON
lsparkler.load(); // load textures
// RIGHT
effectJSON = JSONconfig.get<std::string>("righteffect");
JSONsource = SE::ReadJsonFile(ST::PathToResources + effectJSON);
rsparkler.parse(JSONsource);
rsparkler.load();
// TOP
effectJSON = JSONconfig.get<std::string>("topeffect");
JSONsource = SE::ReadJsonFile(ST::PathToResources + effectJSON);
tsparkler.parse(JSONsource);
tsparkler.load();
// BOTTOM
effectJSON = JSONconfig.get<std::string>("boteffect");
JSONsource = SE::ReadJsonFile(ST::PathToResources + effectJSON);
bsparkler.parse(JSONsource);
bsparkler.load();
//effectJSON = JSONconfig.get<std::string>("lefteffect");
////boost::property_tree::json_parser::read_json(ST::PathToResources + effectJSON, JSONsource);
// JSONsource = SE::ReadJsonFile(ST::PathToResources + effectJSON);
//lsparkler.parse(JSONsource); // parse JSON
//lsparkler.load(); // load textures
//// RIGHT
//effectJSON = JSONconfig.get<std::string>("righteffect");
// JSONsource = SE::ReadJsonFile(ST::PathToResources + effectJSON);
//rsparkler.parse(JSONsource);
//rsparkler.load();
//// TOP
//effectJSON = JSONconfig.get<std::string>("topeffect");
// JSONsource = SE::ReadJsonFile(ST::PathToResources + effectJSON);
//tsparkler.parse(JSONsource);
//tsparkler.load();
//// BOTTOM
//effectJSON = JSONconfig.get<std::string>("boteffect");
// JSONsource = SE::ReadJsonFile(ST::PathToResources + effectJSON);
//bsparkler.parse(JSONsource);
//bsparkler.load();
// Level finish
effectJSON = JSONconfig.get<std::string>("lvlFinish");
JSONsource = SE::ReadJsonFile(ST::PathToResources + effectJSON);
@@ -892,10 +892,10 @@ void TMyApplication::EffectsInit() {
}
void TMyApplication::EffectsUpdate(size_t dt) {
lsparkler.update(dt / 1000.f);
rsparkler.update(dt / 1000.f);
tsparkler.update(dt / 1000.f);
bsparkler.update(dt / 1000.f);
//lsparkler.update(dt / 1000.f);
//rsparkler.update(dt / 1000.f);
//tsparkler.update(dt / 1000.f);
//bsparkler.update(dt / 1000.f);
lvlFirework.update(dt / 1000.f);
}
void TMyApplication::EffectsDraw() {
@@ -927,10 +927,10 @@ void TMyApplication::EffectsDraw() {
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
lsparkler.draw();
rsparkler.draw();
tsparkler.draw();
bsparkler.draw();
//lsparkler.draw();
//rsparkler.draw();
//tsparkler.draw();
//bsparkler.draw();
lvlFirework.draw();
Renderer->PopMatrix();