diff --git a/assets/SSAA_4X.frag b/assets/SSAA_4X.frag index 62db00e..8427bba 100755 --- a/assets/SSAA_4X.frag +++ b/assets/SSAA_4X.frag @@ -14,5 +14,6 @@ void main() } color /= 4; - gl_FragColor = vec4(texture2D(Texture, texCoord ), 1.0); + //gl_FragColor = vec4(texture2D(Texture, texCoord ), 1.0); + gl_FragColor = vec4(color, 1.0); } \ No newline at end of file diff --git a/assets/back_btn.png b/assets/back_btn.png deleted file mode 100755 index 4176c8b..0000000 Binary files a/assets/back_btn.png and /dev/null differ diff --git a/assets/ball.png b/assets/ball.png deleted file mode 100755 index 4a2cfc5..0000000 Binary files a/assets/ball.png and /dev/null differ diff --git a/assets/ball_glow.png b/assets/ball_glow.png deleted file mode 100755 index 5fc1138..0000000 Binary files a/assets/ball_glow.png and /dev/null differ diff --git a/assets/block1.png b/assets/block1.png deleted file mode 100755 index 8cd98ae..0000000 Binary files a/assets/block1.png and /dev/null differ diff --git a/assets/block2.png b/assets/block2.png deleted file mode 100755 index d38c770..0000000 Binary files a/assets/block2.png and /dev/null differ diff --git a/assets/block3.png b/assets/block3.png deleted file mode 100755 index 2faf8e7..0000000 Binary files a/assets/block3.png and /dev/null differ diff --git a/assets/bonus_floor.png b/assets/bonus_floor.png deleted file mode 100755 index 58648e9..0000000 Binary files a/assets/bonus_floor.png and /dev/null differ diff --git a/assets/bonus_gothrough.png b/assets/bonus_gothrough.png deleted file mode 100755 index a7eb20c..0000000 Binary files a/assets/bonus_gothrough.png and /dev/null differ diff --git a/assets/bonus_multiplier.png b/assets/bonus_multiplier.png deleted file mode 100755 index 4efbc80..0000000 Binary files a/assets/bonus_multiplier.png and /dev/null differ diff --git a/assets/credits.png b/assets/credits.png deleted file mode 100755 index 6debee7..0000000 Binary files a/assets/credits.png and /dev/null differ diff --git a/assets/droid_sans14_font_bitmap.png b/assets/droid_sans14_font_bitmap.png deleted file mode 100755 index b7d1985..0000000 Binary files a/assets/droid_sans14_font_bitmap.png and /dev/null differ diff --git a/assets/game_end.png b/assets/game_end.png deleted file mode 100755 index e7fb288..0000000 Binary files a/assets/game_end.png and /dev/null differ diff --git a/assets/level1.txt b/assets/level1.txt deleted file mode 100755 index 1cfbdae..0000000 --- a/assets/level1.txt +++ /dev/null @@ -1,33 +0,0 @@ -0, 255, 255, 255 -0, 0, 0, 255 -255, 0, 0, 255 -255, 40, 40, 255 -255, 128, 128, 255 -Colormap -111111111111 -111111111111 -111111111111 -222222222222 -222222222222 -222222222222 -222222222222 -333333333333 -333333333333 -333333333333 -000000000000 -000000000000 -000000000000 -Brickmap -111111111111 -111111111111 -111111111111 -000000000000 -111111111111 -111111111111 -000000000000 -111111111111 -111111111111 -000000000000 -000000000000 -000000000000 -000000000000 \ No newline at end of file diff --git a/assets/level10.txt b/assets/level10.txt deleted file mode 100755 index 85caa92..0000000 --- a/assets/level10.txt +++ /dev/null @@ -1,32 +0,0 @@ -0, 255, 255, 255 -0, 0, 0, 255 -255, 0, 190, 255 -255, 0, 255, 255 -Colormap -002222222200 -002222222200 -000222222000 -000022220000 -111002200111 -111100001111 -011110011110 -001111111100 -000111111000 -000011110000 -000001100000 -000000000000 -000000000000 -Brickmap -002111111200 -002211112200 -000221122000 -000022220000 -111002200111 -221100001122 -022110011220 -002211112200 -000221122000 -000022220000 -000002200000 -000000000000 -000000000000 diff --git a/assets/level11.txt b/assets/level11.txt deleted file mode 100755 index e9570db..0000000 --- a/assets/level11.txt +++ /dev/null @@ -1,33 +0,0 @@ -255, 255, 255, 255 -0, 0, 0, 255 -0, 237, 255, 255 -0, 144, 255, 255 -0, 59, 255, 255 -Colormap -333333333333 -333333333333 -333333333333 -000000000000 -222220022222 -222220022222 -222220022222 -000000000000 -111110011111 -111110011111 -111110011111 -000000000000 -000000000000 -Brickmap -111111111111 -111111111111 -222222222222 -000000000000 -111110011111 -111110011111 -222220022222 -000000000000 -111110011111 -111110011111 -333330033333 -000000000000 -000000000000 diff --git a/assets/level12.txt b/assets/level12.txt deleted file mode 100755 index 3284830..0000000 --- a/assets/level12.txt +++ /dev/null @@ -1,32 +0,0 @@ -255, 128, 128, 255 -0, 0, 0, 255 -159, 240, 255, 255 -0, 148, 255, 255 -Colormap -111111111111 -222222222222 -111111111111 -222222222222 -111111111111 -222222222222 -111111111111 -222222222222 -111111111111 -222222222222 -111111111111 -222222222222 -111111111111 -Brickmap -000311113000 -000311113000 -333311113333 -111111111111 -111111111111 -222221122222 -333321123333 -000321123000 -000321123000 -000322223000 -000333333000 -000000000000 -000000000000 diff --git a/assets/level1ogg.ogg b/assets/level1ogg.ogg deleted file mode 100755 index ce86d31..0000000 Binary files a/assets/level1ogg.ogg and /dev/null differ diff --git a/assets/level2.txt b/assets/level2.txt deleted file mode 100755 index c1bd395..0000000 --- a/assets/level2.txt +++ /dev/null @@ -1,32 +0,0 @@ -255, 0, 0, 255 -0, 0, 0, 255 -0, 255, 255, 255 -7, 255, 189, 255 -Colormap -111111111111 -222222222222 -111111111111 -222222222222 -111111111111 -222222222222 -111111111111 -222222222222 -111111111111 -222222222222 -111111111111 -222222222222 -000000000000 -Brickmap -111011110111 -111011110111 -222022220222 -000000000000 -111011110111 -222022220222 -000000000000 -111000000111 -222000000222 -000000000000 -222222222222 -000000000000 -000000000000 diff --git a/assets/level3.txt b/assets/level3.txt deleted file mode 100755 index 8a9521e..0000000 --- a/assets/level3.txt +++ /dev/null @@ -1,33 +0,0 @@ -0, 255, 255, 255 -0, 0, 0, 255 -0, 151, 113, 255 -7, 255, 189, 255 -128, 143, 128, 255 -Colormap -000000000000 -033333333330 -031111111130 -031111111130 -033333333330 -000000000000 -033330033330 -032230032230 -032230032230 -033330033330 -000000000000 -000000000000 -000000000000 -Brickmap -000000000000 -022222222220 -021111111120 -021111111120 -022222222220 -000000000000 -022220022220 -021120021120 -021120021120 -022220022220 -000000000000 -000000000000 -000000000000 diff --git a/assets/level4.txt b/assets/level4.txt deleted file mode 100755 index 7c83fc1..0000000 --- a/assets/level4.txt +++ /dev/null @@ -1,33 +0,0 @@ -255, 0, 0, 255 -0, 0, 0, 255 -101, 97, 255, 255 -5, 186, 255, 255 -105, 201, 255, 255 -Colormap -000000333333 -000003333333 -000033311111 -333333133333 -333331333333 -333313333333 -111133311111 -333333100000 -333331000000 -333310000000 -111100000000 -000000000000 -000000000000 -Brickmap -000000111111 -000001111111 -000011133333 -111111311111 -111113111111 -111131111111 -333311133333 -111111300000 -111113000000 -111130000000 -333300000000 -000000000000 -000000000000 diff --git a/assets/level5.txt b/assets/level5.txt deleted file mode 100755 index 1a5d7c4..0000000 --- a/assets/level5.txt +++ /dev/null @@ -1,32 +0,0 @@ -255, 0, 255, 255 -0, 0, 0, 255 -163, 255, 198, 255 -0, 255, 182, 255 -Colormap -000022220000 -000222222000 -000022220000 -111000000111 -111100001111 -111110011111 -111111111111 -111111111111 -111111111111 -111111111111 -000000000000 -000000000000 -000000000000 -Brickmap -000033330000 -000311113000 -000033330000 -111000000111 -111100001111 -111110011111 -111111111111 -111111111111 -111111111111 -222222222222 -000000000000 -000000000000 -000000000000 diff --git a/assets/level6.txt b/assets/level6.txt deleted file mode 100755 index cf32e5e..0000000 --- a/assets/level6.txt +++ /dev/null @@ -1,33 +0,0 @@ -255, 255, 255, 255 -0, 0, 0, 255 -255, 200, 5, 255 -255, 153, 0, 255 -255, 97, 0, 255 -Colormap -000000000000 -000333000333 -000333000333 -000333000333 -222000222000 -222000222000 -222000222000 -000111000111 -000111000111 -000111000111 -000000000000 -000000000000 -000000000000 -Brickmap -000000000000 -000222000222 -000212000212 -000222000222 -222000222000 -212000212000 -222000222000 -000222000222 -000212000212 -000222000222 -000000000000 -000000000000 -000000000000 diff --git a/assets/level7.txt b/assets/level7.txt deleted file mode 100755 index 5a11037..0000000 --- a/assets/level7.txt +++ /dev/null @@ -1,33 +0,0 @@ -255, 255, 0, 255 -0, 0, 0, 255 -230, 230, 230, 255 -195, 195, 195, 255 -150, 150, 150, 255 -Colormap -333333333333 -030030030030 -030030030030 -030030030030 -222222222222 -020020020020 -020020020020 -010010010010 -010010010010 -020020020020 -000000000000 -000000000000 -000000000000 -Brickmap -111111111111 -010010010010 -010010010010 -010010010010 -222222222222 -010010010010 -010010010010 -010010010010 -010010010010 -020020020020 -000000000000 -000000000000 -000000000000 diff --git a/assets/level8.txt b/assets/level8.txt deleted file mode 100755 index 8e97e38..0000000 --- a/assets/level8.txt +++ /dev/null @@ -1,32 +0,0 @@ -0, 255, 255, 255 -0, 0, 0, 255 -217, 56, 62, 255 -132, 56, 62, 255 -Colormap -111111111111 -111111111111 -222211112222 -000211112000 -000211112000 -022211112220 -021111111120 -021111111120 -021111111120 -022222222220 -000000000000 -000000000000 -000000000000 -Brickmap -111111111111 -111111111111 -222211112222 -000211112000 -000211112000 -022211112220 -021111111120 -021111111120 -021111111120 -033333333330 -000000000000 -000000000000 -000000000000 diff --git a/assets/level9.txt b/assets/level9.txt deleted file mode 100755 index e698b59..0000000 --- a/assets/level9.txt +++ /dev/null @@ -1,32 +0,0 @@ -0, 255, 0, 255 -0, 0, 0, 255 -255, 221, 0, 255 -255, 0, 0, 255 -Colormap -222220022222 -222220022222 -222220022222 -222220022222 -000000000000 -111111111111 -111111111111 -000000000000 -111111111111 -111111111111 -000000000000 -000000000000 -000000000000 -Brickmap -111110011111 -111110011111 -111110011111 -222220022222 -000000000000 -111111111111 -333333333333 -000000000000 -111111111111 -222222222222 -000000000000 -000000000000 -000000000000 diff --git a/assets/levelshot1.png b/assets/levelshot1.png deleted file mode 100755 index 48471ef..0000000 Binary files a/assets/levelshot1.png and /dev/null differ diff --git a/assets/levelshot10.png b/assets/levelshot10.png deleted file mode 100755 index de464ec..0000000 Binary files a/assets/levelshot10.png and /dev/null differ diff --git a/assets/levelshot11.png b/assets/levelshot11.png deleted file mode 100755 index 96bf193..0000000 Binary files a/assets/levelshot11.png and /dev/null differ diff --git a/assets/levelshot12.png b/assets/levelshot12.png deleted file mode 100755 index 4696264..0000000 Binary files a/assets/levelshot12.png and /dev/null differ diff --git a/assets/levelshot2.png b/assets/levelshot2.png deleted file mode 100755 index a9872d8..0000000 Binary files a/assets/levelshot2.png and /dev/null differ diff --git a/assets/levelshot3.png b/assets/levelshot3.png deleted file mode 100755 index 02e5a20..0000000 Binary files a/assets/levelshot3.png and /dev/null differ diff --git a/assets/levelshot4.png b/assets/levelshot4.png deleted file mode 100755 index f17800d..0000000 Binary files a/assets/levelshot4.png and /dev/null differ diff --git a/assets/levelshot5.png b/assets/levelshot5.png deleted file mode 100755 index a80ca69..0000000 Binary files a/assets/levelshot5.png and /dev/null differ diff --git a/assets/levelshot6.png b/assets/levelshot6.png deleted file mode 100755 index a21edcc..0000000 Binary files a/assets/levelshot6.png and /dev/null differ diff --git a/assets/levelshot7.png b/assets/levelshot7.png deleted file mode 100755 index 3875a7a..0000000 Binary files a/assets/levelshot7.png and /dev/null differ diff --git a/assets/levelshot8.png b/assets/levelshot8.png deleted file mode 100755 index 6f99af8..0000000 Binary files a/assets/levelshot8.png and /dev/null differ diff --git a/assets/levelshot9.png b/assets/levelshot9.png deleted file mode 100755 index 4fd00ec..0000000 Binary files a/assets/levelshot9.png and /dev/null differ diff --git a/assets/loading.png b/assets/loading.png deleted file mode 100755 index 482d602..0000000 Binary files a/assets/loading.png and /dev/null differ diff --git a/assets/logo_small.png b/assets/logo_small.png deleted file mode 100755 index 4596028..0000000 Binary files a/assets/logo_small.png and /dev/null differ diff --git a/assets/main_menu_bkg_left.png b/assets/main_menu_bkg_left.png deleted file mode 100755 index afd94ec..0000000 Binary files a/assets/main_menu_bkg_left.png and /dev/null differ diff --git a/assets/main_menu_bkg_right.png b/assets/main_menu_bkg_right.png deleted file mode 100755 index 066d439..0000000 Binary files a/assets/main_menu_bkg_right.png and /dev/null differ diff --git a/assets/reflector.png b/assets/reflector.png deleted file mode 100755 index 6d3bcd2..0000000 Binary files a/assets/reflector.png and /dev/null differ diff --git a/assets/select_level.png b/assets/select_level.png deleted file mode 100755 index 9e2ee25..0000000 Binary files a/assets/select_level.png and /dev/null differ diff --git a/assets/shutterstock1.png b/assets/shutterstock1.png deleted file mode 100755 index a9f949a..0000000 Binary files a/assets/shutterstock1.png and /dev/null differ diff --git a/assets/shutterstock10.png b/assets/shutterstock10.png deleted file mode 100755 index e028dd6..0000000 Binary files a/assets/shutterstock10.png and /dev/null differ diff --git a/assets/shutterstock11.png b/assets/shutterstock11.png deleted file mode 100755 index 51f626e..0000000 Binary files a/assets/shutterstock11.png and /dev/null differ diff --git a/assets/shutterstock12.png b/assets/shutterstock12.png deleted file mode 100755 index badbbe0..0000000 Binary files a/assets/shutterstock12.png and /dev/null differ diff --git a/assets/shutterstock2.png b/assets/shutterstock2.png deleted file mode 100755 index c6ffbb5..0000000 Binary files a/assets/shutterstock2.png and /dev/null differ diff --git a/assets/shutterstock3.png b/assets/shutterstock3.png deleted file mode 100755 index 22b11ba..0000000 Binary files a/assets/shutterstock3.png and /dev/null differ diff --git a/assets/shutterstock4.png b/assets/shutterstock4.png deleted file mode 100755 index 5756d84..0000000 Binary files a/assets/shutterstock4.png and /dev/null differ diff --git a/assets/shutterstock5.png b/assets/shutterstock5.png deleted file mode 100755 index fcb63f7..0000000 Binary files a/assets/shutterstock5.png and /dev/null differ diff --git a/assets/shutterstock6.png b/assets/shutterstock6.png deleted file mode 100755 index 40b1b3a..0000000 Binary files a/assets/shutterstock6.png and /dev/null differ diff --git a/assets/shutterstock7.png b/assets/shutterstock7.png deleted file mode 100755 index 12e82a6..0000000 Binary files a/assets/shutterstock7.png and /dev/null differ diff --git a/assets/shutterstock8.png b/assets/shutterstock8.png deleted file mode 100755 index dba9cbe..0000000 Binary files a/assets/shutterstock8.png and /dev/null differ diff --git a/assets/shutterstock9.png b/assets/shutterstock9.png deleted file mode 100755 index 33ce46f..0000000 Binary files a/assets/shutterstock9.png and /dev/null differ diff --git a/assets/slide_up_btn.png b/assets/slide_up_btn.png deleted file mode 100755 index fb26969..0000000 Binary files a/assets/slide_up_btn.png and /dev/null differ diff --git a/assets/tap_to_continue_btn.png b/assets/tap_to_continue_btn.png deleted file mode 100755 index b9b51c1..0000000 Binary files a/assets/tap_to_continue_btn.png and /dev/null differ diff --git a/assets/wall_bonus.png b/assets/wall_bonus.png deleted file mode 100755 index 7f94f41..0000000 Binary files a/assets/wall_bonus.png and /dev/null differ diff --git a/assets/wall_left.png b/assets/wall_left.png deleted file mode 100755 index 9baad70..0000000 Binary files a/assets/wall_left.png and /dev/null differ diff --git a/assets/wall_right.png b/assets/wall_right.png deleted file mode 100755 index ab50ea3..0000000 Binary files a/assets/wall_right.png and /dev/null differ diff --git a/assets/wall_up.png b/assets/wall_up.png deleted file mode 100755 index c14e614..0000000 Binary files a/assets/wall_up.png and /dev/null differ diff --git a/game/main_code.cpp b/game/main_code.cpp index 33f4cf0..3b10050 100644 --- a/game/main_code.cpp +++ b/game/main_code.cpp @@ -7,47 +7,8 @@ #include "include/Engine.h" -#include "menucode.h" - #include "main_code.h" -boost::signals2::signal OnTapUpSignal; -boost::signals2::signal OnTapUpAfterMoveSignal; -boost::signals2::signal OnTapDownSignal; -boost::signals2::signal OnFlingSignal; -boost::signals2::signal OnScrollSignal; - -boost::signals2::signal OnDrawSignal; - - -const std::string CONST_BLOCK_TEXTURE1 = "block1"; -const std::string CONST_BLOCK_TEXTURE2 = "block2"; -const std::string CONST_BLOCK_TEXTURE3 = "block3"; - -const std::string CONST_BONUS_GOTHROUGH_TEXTURE = "bonus_gothrough"; -const std::string CONST_BONUS_MULTIPLIER_TEXTURE = "bonus_multiplier"; -const std::string CONST_BONUS_FLOOR_TEXTURE = "bonus_floor"; - -const std::string CONST_BALL_TEXTURE = "ball"; -const std::string CONST_BALLGLOW_TEXTURE = "ball_glow"; - -const std::string CONST_REFLECTOR_TEXTURE = "reflector"; - -const std::string CONST_WALL_LEFT_TEXTURE = "wall_left"; -const std::string CONST_WALL_RIGHT_TEXTURE = "wall_right"; -const std::string CONST_WALL_UP_TEXTURE = "wall_up"; -const std::string CONST_WALL_BONUS_TEXTURE = "wall_bonus"; - -const std::string CONST_BACK_BTN_TEXTURE = "back_btn"; -const std::string CONST_SLIDE_UP_BTN_TEXTURE = "slide_up_btn"; -const std::string CONST_TAP_TO_CONTINUE_BTN_TEXTURE = "tap_to_continue_btn"; -const std::string CONST_LOADING_TEXTURE = "loading"; -const std::string CONST_LOGO_SMALL_TEXTURE = "logo_small"; -const std::string CONST_LOADING_BACKGROUND_BLACK = "loading_background_black"; -const std::string CONST_CREDITS_TEXTURE = "credits"; - -const float CONST_CREDITS_SHOW_TIME = 150.f; - TMyApplication* Application; @@ -73,50 +34,64 @@ void TMyApplication::InnerInit() *Console<<"APP INIT\n"; } srand (static_cast(time(NULL))); - GameState = CONST_GAMESTATE_PRELOADING; - StateTimer = 0.f; - ResourceManager->ShaderManager.AddShader("DefaultShader", "shader1vertex.txt", "shader1fragment.txt"); ResourceManager->ShaderManager.AddShader("FrameShader", "frameshader_vertex.txt", "frameshader_fragment.txt"); - ResourceManager->ShaderManager.AddShader("BrickShader", "brickshader_vertex.txt", "brickshader_fragment.txt"); ResourceManager->ShaderManager.AddShader("ColorShader", "color_vertex.txt", "color_fragment.txt"); ResourceManager->ShaderManager.AddShader("SSAA_4X", "SSAA_4X.vertex", "SSAA_4X.frag"); Renderer->PushShader("DefaultShader"); - ResourceManager->TexList.AddTexture(CONST_LOADING_BACKGROUND_BLACK + ".png", CONST_LOADING_BACKGROUND_BLACK); - ResourceManager->TexList.AddTexture(CONST_LOADING_TEXTURE + ".png", CONST_LOADING_TEXTURE); - ResourceManager->TexList.AddTexture(CONST_LOGO_SMALL_TEXTURE + ".png", CONST_LOGO_SMALL_TEXTURE); - ResourceManager->TexList.AddTexture("console_bkg.bmp"); - ResourceManager->FrameManager.AddFrameRenderBuffer("LevelBuffer", 480 * 2, 320 * 2); + ResourceManager->FrameManager.AddFrameRenderBuffer("LevelBuffer", 512, 512); - OnDrawSignal.connect(boost::bind(&TGameLoading::Draw, boost::ref(GameLoading))); - Inited = true; + pair.second.Data.Vec3CoordArr[CONST_STRING_POSITION_ATTRIB].push_back(Vector3f(0, 0, 0)); + pair.second.Data.Vec3CoordArr[CONST_STRING_POSITION_ATTRIB].push_back(Vector3f(0, 512, 0)); + pair.second.Data.Vec3CoordArr[CONST_STRING_POSITION_ATTRIB].push_back(Vector3f(512, 512, 0)); + pair.second.Data.Vec3CoordArr[CONST_STRING_POSITION_ATTRIB].push_back(Vector3f(0, 0, 0)); + pair.second.Data.Vec3CoordArr[CONST_STRING_POSITION_ATTRIB].push_back(Vector3f(512, 512, 0)); + pair.second.Data.Vec3CoordArr[CONST_STRING_POSITION_ATTRIB].push_back(Vector3f(512, 0, 0)); + + + pair.second.Data.Vec4CoordArr[CONST_STRING_COLOR_ATTRIB].push_back(Vector4f(1, 0, 0, 1)); + pair.second.Data.Vec4CoordArr[CONST_STRING_COLOR_ATTRIB].push_back(Vector4f(1, 0, 0, 1)); + pair.second.Data.Vec4CoordArr[CONST_STRING_COLOR_ATTRIB].push_back(Vector4f(0, 1, 0, 1)); + pair.second.Data.Vec4CoordArr[CONST_STRING_COLOR_ATTRIB].push_back(Vector4f(0, 0, 1, 1)); + pair.second.Data.Vec4CoordArr[CONST_STRING_COLOR_ATTRIB].push_back(Vector4f(0, 0, 1, 1)); + pair.second.Data.Vec4CoordArr[CONST_STRING_COLOR_ATTRIB].push_back(Vector4f(0, 1, 0, 1)); + + pair.first.ShaderName = "ColorShader"; + + pair.second.RefreshBuffer(); + + + + + rect.second.Data.Vec3CoordArr[CONST_STRING_POSITION_ATTRIB].push_back(Vector3f(0, 0, 0)); + rect.second.Data.Vec3CoordArr[CONST_STRING_POSITION_ATTRIB].push_back(Vector3f(0, 512, 0)); + rect.second.Data.Vec3CoordArr[CONST_STRING_POSITION_ATTRIB].push_back(Vector3f(512, 512, 0)); + rect.second.Data.Vec3CoordArr[CONST_STRING_POSITION_ATTRIB].push_back(Vector3f(512, 512, 0)); + rect.second.Data.Vec3CoordArr[CONST_STRING_POSITION_ATTRIB].push_back(Vector3f(512, 0, 0)); + rect.second.Data.Vec3CoordArr[CONST_STRING_POSITION_ATTRIB].push_back(Vector3f(0, 0, 0)); + + rect.second.Data.Vec2CoordArr[CONST_STRING_TEXCOORD_ATTRIB].push_back(Vector2f(0, 0)); + rect.second.Data.Vec2CoordArr[CONST_STRING_TEXCOORD_ATTRIB].push_back(Vector2f(0, 1)); + rect.second.Data.Vec2CoordArr[CONST_STRING_TEXCOORD_ATTRIB].push_back(Vector2f(1, 1)); + rect.second.Data.Vec2CoordArr[CONST_STRING_TEXCOORD_ATTRIB].push_back(Vector2f(1, 1)); + rect.second.Data.Vec2CoordArr[CONST_STRING_TEXCOORD_ATTRIB].push_back(Vector2f(1, 0)); + rect.second.Data.Vec2CoordArr[CONST_STRING_TEXCOORD_ATTRIB].push_back(Vector2f(0, 0)); + + + rect.second.RefreshBuffer(); Renderer->SetOrthoProjection(); Renderer->SetFullScreenViewport(); - Renderer->PushShader("SSAA_4X"); + Inited = true; - const float cos30 = sqrt(3) / 2; - const float sin30 = 0.5f; - const float sampleRadiusX = 0.75 / 480; - const float sampleRadiusY = 0.75 / 320; - Vector2f offset; - offset = Vector2f(cos30 * sampleRadiusX, sin30 * sampleRadiusY); - RenderUniform2fv("samplesOffset[0]", &offset[0]); - offset = Vector2f(-sin30 * sampleRadiusX, cos30 * sampleRadiusY); - RenderUniform2fv("samplesOffset[1]", &offset[0]); - offset = Vector2f(-cos30 * sampleRadiusX, -sin30 * sampleRadiusY); - RenderUniform2fv("samplesOffset[2]", &offset[0]); - offset = Vector2f(sin30 * sampleRadiusX, -cos30 * sampleRadiusY); - RenderUniform2fv("samplesOffset[3]", &offset[0]); - Renderer->PopShader(); } void TMyApplication::InnerDeinit() @@ -128,215 +103,91 @@ void TMyApplication::InnerDeinit() *Console<<"APP DEINIT\n"; } - OnTapUpSignal.disconnect(boost::bind(&TGameLevel::OnTapUp, boost::ref(GameLevel), _1)); - OnTapUpSignal.disconnect(boost::bind(&TGameMenu::OnTapUp, boost::ref(Menu), _1)); - - OnTapUpAfterMoveSignal.disconnect(boost::bind(&TGameMenu::OnTapUpAfterMove, boost::ref(Menu), _1)); - - - OnFlingSignal.disconnect(boost::bind(&TGameLevel::OnFling, boost::ref(GameLevel), _1)); - OnFlingSignal.disconnect(boost::bind(&TGameMenu::OnFling, boost::ref(Menu), _1)); - - OnScrollSignal.disconnect(boost::bind(&TGameLevel::OnScroll, boost::ref(GameLevel), _1)); - OnScrollSignal.disconnect(boost::bind(&TGameMenu::OnScroll, boost::ref(Menu), _1)); - - OnTapDownSignal.disconnect(boost::bind(&TGameLevel::OnTapDown, boost::ref(GameLevel), _1)); - OnTapDownSignal.disconnect(boost::bind(&TGameMenu::OnTapDown, boost::ref(Menu), _1)); - OnTapDownSignal.disconnect(boost::bind(&TGameCredits::OnTapDown, boost::ref(GameCredits), _1)); - - - OnDrawSignal.disconnect(boost::bind(&TGameLoading::Draw, boost::ref(GameLoading))); - OnDrawSignal.disconnect(boost::bind(&TGameMenu::Draw, boost::ref(Menu))); - OnDrawSignal.disconnect(boost::bind(&TGameLevel::Draw, boost::ref(GameLevel))); - OnDrawSignal.disconnect(boost::bind(&TGameCredits::Draw, boost::ref(GameCredits))); - } void TMyApplication::InnerOnTapDown(Vector2f p) { - //-OnTapDownSignal(Vector2f(p.v[0], p.v[1])); - OnTapDownSignal(Vector2f(p(0), p(1))); + } void TMyApplication::InnerOnTapUp(Vector2f p) { - OnTapUpSignal(Vector2f(p(0), p(1))); + } void TMyApplication::InnerOnTapUpAfterMove(Vector2f p) { - OnTapUpAfterMoveSignal(Vector2f(p(0), p(1))); + } void TMyApplication::InnerOnMove(Vector2f p, Vector2f shift) { - OnScrollSignal(Vector2f(shift(0), shift(1))); + } void TMyApplication::OnFling(Vector2f v) { } - -void TMyApplication::ApplySignalsToMenu() -{ - - OnTapUpSignal.connect(boost::bind(&TGameMenu::OnTapUp, boost::ref(Menu), _1)); - OnTapUpAfterMoveSignal.connect(boost::bind(&TGameMenu::OnTapUpAfterMove, boost::ref(Menu), _1)); - OnFlingSignal.connect(boost::bind(&TGameMenu::OnFling, boost::ref(Menu), _1)); - OnScrollSignal.connect(boost::bind(&TGameMenu::OnScroll, boost::ref(Menu), _1)); - OnTapDownSignal.connect(boost::bind(&TGameMenu::OnTapDown, boost::ref(Menu), _1)); - -} - - -void TMyApplication::DisapplySignalsToMenu() -{ - OnTapUpSignal.disconnect(boost::bind(&TGameMenu::OnTapUp, boost::ref(Menu), _1)); - OnTapUpAfterMoveSignal.disconnect(boost::bind(&TGameMenu::OnTapUpAfterMove, boost::ref(Menu), _1)); - OnFlingSignal.disconnect(boost::bind(&TGameMenu::OnFling, boost::ref(Menu), _1)); - OnScrollSignal.disconnect(boost::bind(&TGameMenu::OnScroll, boost::ref(Menu), _1)); - OnTapDownSignal.disconnect(boost::bind(&TGameMenu::OnTapDown, boost::ref(Menu), _1)); -} - -void TMyApplication::ApplySignalsToGame() -{ - OnTapUpSignal.connect(boost::bind(&TGameLevel::OnTapUp, boost::ref(GameLevel), _1)); - OnFlingSignal.connect(boost::bind(&TGameLevel::OnFling, boost::ref(GameLevel), _1)); - OnScrollSignal.connect(boost::bind(&TGameLevel::OnScroll, boost::ref(GameLevel), _1)); - OnTapDownSignal.connect(boost::bind(&TGameLevel::OnTapDown, boost::ref(GameLevel), _1)); - -} - -void TMyApplication::DisapplySignalsToGame() -{ - OnTapUpSignal.disconnect(boost::bind(&TGameLevel::OnTapUp, boost::ref(GameLevel), _1)); - OnFlingSignal.disconnect(boost::bind(&TGameLevel::OnFling, boost::ref(GameLevel), _1)); - OnScrollSignal.disconnect(boost::bind(&TGameLevel::OnScroll, boost::ref(GameLevel), _1)); - OnTapDownSignal.disconnect(boost::bind(&TGameLevel::OnTapDown, boost::ref(GameLevel), _1)); - -} - -void TMyApplication::ApplySignalsToCredits() -{ - OnTapDownSignal.connect(boost::bind(&TGameCredits::OnTapDown, boost::ref(GameCredits), _1)); -} - - -void TMyApplication::DisapplySignalsToCredits() -{ - OnTapDownSignal.disconnect(boost::bind(&TGameCredits::OnTapDown, boost::ref(GameCredits), _1)); -} - -void TMyApplication::LoadResources() -{ - - TextureNamesToLoad.clear(); - - TextureNamesToLoad.push_back(std::pair("main_menu_bkg_left.png", "main_menu_bkg_left")); - TextureNamesToLoad.push_back(std::pair("main_menu_bkg_right.png", "main_menu_bkg_right")); - TextureNamesToLoad.push_back(std::pair("select_level.png", "select_level")); - TextureNamesToLoad.push_back(std::pair("shutterstock1.png", "shutterstock1")); - TextureNamesToLoad.push_back(std::pair("shutterstock2.png", "shutterstock2")); - TextureNamesToLoad.push_back(std::pair("shutterstock3.png", "shutterstock3")); - TextureNamesToLoad.push_back(std::pair("shutterstock4.png", "shutterstock4")); - TextureNamesToLoad.push_back(std::pair("shutterstock5.png", "shutterstock5")); - TextureNamesToLoad.push_back(std::pair("shutterstock6.png", "shutterstock6")); - TextureNamesToLoad.push_back(std::pair("shutterstock7.png", "shutterstock7")); - TextureNamesToLoad.push_back(std::pair("shutterstock8.png", "shutterstock8")); - TextureNamesToLoad.push_back(std::pair("shutterstock9.png", "shutterstock9")); - - TextureNamesToLoad.push_back(std::pair("shutterstock10.png", "shutterstock10")); - TextureNamesToLoad.push_back(std::pair("shutterstock11.png", "shutterstock11")); - TextureNamesToLoad.push_back(std::pair("shutterstock12.png", "shutterstock12")); - TextureNamesToLoad.push_back(std::pair("levelshot1.png", "levelshot1")); - TextureNamesToLoad.push_back(std::pair("levelshot2.png", "levelshot2")); - TextureNamesToLoad.push_back(std::pair("levelshot3.png", "levelshot3")); - TextureNamesToLoad.push_back(std::pair("levelshot4.png", "levelshot4")); - TextureNamesToLoad.push_back(std::pair("levelshot5.png", "levelshot5")); - TextureNamesToLoad.push_back(std::pair("levelshot6.png", "levelshot6")); - TextureNamesToLoad.push_back(std::pair("levelshot7.png", "levelshot7")); - TextureNamesToLoad.push_back(std::pair("levelshot8.png", "levelshot8")); - TextureNamesToLoad.push_back(std::pair("levelshot9.png", "levelshot9")); - TextureNamesToLoad.push_back(std::pair("levelshot10.png", "levelshot10")); - TextureNamesToLoad.push_back(std::pair("levelshot11.png", "levelshot11")); - TextureNamesToLoad.push_back(std::pair("levelshot12.png", "levelshot12")); - TextureNamesToLoad.push_back(std::pair("game_end.png", "game_end")); - - TextureNamesToLoad.push_back(std::pair(CONST_BLOCK_TEXTURE1 + ".png", CONST_BLOCK_TEXTURE1)); - TextureNamesToLoad.push_back(std::pair(CONST_BLOCK_TEXTURE2 + ".png", CONST_BLOCK_TEXTURE2)); - TextureNamesToLoad.push_back(std::pair(CONST_BLOCK_TEXTURE3 + ".png", CONST_BLOCK_TEXTURE3)); - TextureNamesToLoad.push_back(std::pair(CONST_BONUS_GOTHROUGH_TEXTURE + ".png", CONST_BONUS_GOTHROUGH_TEXTURE)); - TextureNamesToLoad.push_back(std::pair(CONST_BONUS_MULTIPLIER_TEXTURE + ".png", CONST_BONUS_MULTIPLIER_TEXTURE)); - TextureNamesToLoad.push_back(std::pair(CONST_BONUS_FLOOR_TEXTURE + ".png", CONST_BONUS_FLOOR_TEXTURE)); - TextureNamesToLoad.push_back(std::pair(CONST_BALL_TEXTURE + ".png", CONST_BALL_TEXTURE)); - TextureNamesToLoad.push_back(std::pair(CONST_BALLGLOW_TEXTURE + ".png", CONST_BALLGLOW_TEXTURE)); - TextureNamesToLoad.push_back(std::pair(CONST_WALL_LEFT_TEXTURE + ".png", CONST_WALL_LEFT_TEXTURE)); - TextureNamesToLoad.push_back(std::pair(CONST_WALL_RIGHT_TEXTURE + ".png", CONST_WALL_RIGHT_TEXTURE)); - TextureNamesToLoad.push_back(std::pair(CONST_WALL_UP_TEXTURE + ".png", CONST_WALL_UP_TEXTURE)); - TextureNamesToLoad.push_back(std::pair(CONST_WALL_BONUS_TEXTURE + ".png", CONST_WALL_BONUS_TEXTURE)); - TextureNamesToLoad.push_back(std::pair(CONST_REFLECTOR_TEXTURE + ".png", CONST_REFLECTOR_TEXTURE)); - TextureNamesToLoad.push_back(std::pair(CONST_BACK_BTN_TEXTURE + ".png", CONST_BACK_BTN_TEXTURE)); - TextureNamesToLoad.push_back(std::pair(CONST_SLIDE_UP_BTN_TEXTURE + ".png", CONST_SLIDE_UP_BTN_TEXTURE)); - TextureNamesToLoad.push_back(std::pair(CONST_TAP_TO_CONTINUE_BTN_TEXTURE + ".png", CONST_TAP_TO_CONTINUE_BTN_TEXTURE)); - TextureNamesToLoad.push_back(std::pair(CONST_CREDITS_TEXTURE + ".png", CONST_CREDITS_TEXTURE)); - -#ifdef TARGET_IOS - ResourceManager->SoundManager.LoadMusicLooped("level1ogg.ogg"); -#else - //ResourceManager->SoundManager.LoadMusic("level1ogg.ogg"); -#endif - - ResourceManager->FontManager.AddFont("droid_sans14", "droid_sans14_font_bitmap.png", "droid_sans14_font_charmap.txt"); - ResourceManager->FontManager.PushFont("droid_sans14"); - - TryLoadSavedGame(); - -} - -void TMyApplication::TryLoadSavedGame() -{ - - std::string fileName = GetFilePathUserData("progress.txt"); - - FILE* file = fopen(fileName.c_str(), "r"); - if (file != NULL) - { - char line[100]; - char* r; - r = fgets(line, 100, file); - if (r != NULL) - { - Menu.SetMenuItemCount(toint(r)); - } - fclose(file); - } -} - -void TMyApplication::TrySaveGame() -{ - - std::string fileName = GetFilePathUserData("progress.txt"); - - std::string s = tostr(Menu.GetMenuItemCount()); - FILE* file = fopen(fileName.c_str(), "w"); - if (file != NULL) - { - fputs(s.c_str(), file); - fflush(file); - fclose(file); - } - -} - - void TMyApplication::InnerDraw() { - glDisable(GL_DEPTH_TEST); + + Renderer->SwitchToFrameBuffer("LevelBuffer"); + Renderer->SetProjectionMatrix(512.f, 512.f); + glClearColor(0.0f, 0.0f, 1.0f, 1.0f); + glClear(GL_DEPTH_BUFFER_BIT | GL_COLOR_BUFFER_BIT); + CheckGlError(""); - OnDrawSignal(); + { + TRenderParamsSetter params(pair.first); + Renderer->DrawTriangleList(pair.second); + } + + CheckGlError(""); + + + Renderer->SwitchToScreen(); + Renderer->SetFullScreenViewport(); + + + const float cos30 = sqrt(3) / 2; + const float sin30 = 0.5f; + const float sampleRadiusX = 0.75 / 512; + const float sampleRadiusY = 0.75 / 512; + + Matrix2f rotate30Matrix; + rotate30Matrix(0, 0) = cos30; + rotate30Matrix(0, 1) = sin30; + rotate30Matrix(1, 0) = -sin30; + rotate30Matrix(1, 1) = cos30; + + + Renderer->PushShader("SSAA_4X"); + + + std::array sampleVector = { + Vector2f(sampleRadiusX, sampleRadiusY), + Vector2f(-sampleRadiusX, sampleRadiusY), + Vector2f(-sampleRadiusX, -sampleRadiusY), + Vector2f(sampleRadiusX, -sampleRadiusY) + }; + + for (size_t i = 0; i < 4; i++) + { + sampleVector[i] = rotate30Matrix * sampleVector[i]; + + RenderUniform2fv("samplesOffset[" + boost::lexical_cast(i) + "]", &sampleVector[i][0]); + } + + + glBindTexture(GL_TEXTURE_2D, ResourceManager->FrameManager.GetFrameTexture("LevelBuffer")); + Renderer->DrawTriangleList(rect.second); + + Renderer->PopShader(); + + CheckGlError(""); } @@ -344,162 +195,6 @@ void TMyApplication::InnerDraw() void TMyApplication::InnerUpdate(size_t dt) { - if (GameState == CONST_GAMESTATE_PRELOADING) - { - *SE::Console << "1CONST_GAMESTATE_PRELOADING"; - StateTimer += dt/1000.f; - if (StateTimer >= 1.f) - { - LoadResources(); - GameState = CONST_GAMESTATE_LOADING; - StateTimer = 0.f; - } - } - else if (GameState == CONST_GAMESTATE_LOADING) - { - *SE::Console << "2CONST_GAMESTATE_LOADING"; - StateTimer += dt/1000.f; - if (StateTimer >= 1.f) - { - StateTimer -= 1.f; - } - - if (TextureNamesToLoad.size() != 0) - { - ResourceManager->TexList.AddTexture(TextureNamesToLoad.begin()->first, TextureNamesToLoad.begin()->second); - TextureNamesToLoad.erase(TextureNamesToLoad.begin()); - } - else - { - GameState = CONST_GAMESTATE_MENU; - ApplySignalsToMenu(); - OnDrawSignal.disconnect(boost::bind(&TGameLoading::Draw, boost::ref(GameLoading))); - OnDrawSignal.connect(0, boost::bind(&TGameMenu::Draw, boost::ref(Menu))); - StateTimer = 0.f; - Loaded = true; - } - } - else if (GameState == CONST_GAMESTATE_LEVEL) - { - *SE::Console << "3CONST_GAMESTATE_LEVEL"; - GameLevel.Update(dt); - } - else if (GameState == CONST_GAMESTATE_MENU) - { - //*SE::Console << "4CONST_GAMESTATE_MENU"; - Menu.Update(dt); - } - else if (GameState == CONST_GAMESTATE_FROM_MENU_TO_LEVEL) - { - *SE::Console << "5CONST_GAMESTATE_FROM_MENU_TO_LEVEL"; - GameLevel.Update(dt); - if (GameLevel.IsLoaded()) - { - //*SE::Console << "5CONST_GAMESTATE_FROM_MENU_TO_LEVEL"; - GameState = CONST_GAMESTATE_LEVEL; - OnDrawSignal.disconnect(boost::bind(&TGameMenu::Draw, boost::ref(Menu))); - //CONNECT SLOT - DisapplySignalsToMenu(); - ApplySignalsToGame(); - } - } - else if (GameState == CONST_GAMESTATE_FROM_MENU_TO_CREDITS) - { - *SE::Console << "6CONST_GAMESTATE_FROM_MENU_TO_CREDITS"; - Menu.Update(dt); - GameCredits.Update(dt); - StateTimer -= dt; - if (StateTimer <= 0.f) - { - GameState = CONST_GAMESTATE_CREDITS; - OnDrawSignal.disconnect(boost::bind(&TGameMenu::Draw, boost::ref(Menu))); - ApplySignalsToCredits(); - StateTimer = 0.f; - } - } - else if (GameState == CONST_GAMESTATE_CREDITS) - { - //*SE::Console << "7CONST_GAMESTATE_CREDITS"; - GameCredits.Update(dt); - } - else if (GameState == CONST_GAMESTATE_FROM_CREDITS_TO_MENU) - { - Menu.Update(dt); - GameCredits.Update(dt); - StateTimer -= dt; - if (StateTimer <= 0.f) - { - GameState = CONST_GAMESTATE_MENU; - StateTimer = 0.f; - ApplySignalsToMenu(); - OnDrawSignal.disconnect(boost::bind(&TGameCredits::Draw, boost::ref(GameCredits))); - } - } -} - - -void TMyApplication::GoFromMenuToGame(int level) -{ -//#ifndef TARGET_IOS -// ResourceManager->SoundManager.PlayMusicLooped("level1ogg.ogg"); -//#endif - - GameLevel.FillWithFile(ST::PathToResources + "level"+tostr(level+1)+".txt"); - GameLevel.SetLoading("shutterstock" + tostr(level+1), "levelshot"+tostr(level+1)); - GameState = CONST_GAMESTATE_FROM_MENU_TO_LEVEL; - OnDrawSignal.connect(1, boost::bind(&TGameLevel::Draw, boost::ref(GameLevel))); - - DisapplySignalsToMenu(); - -} - -void TMyApplication::GoFromGameToMenu() -{ - //#ifndef TARGET_IOS -// ResourceManager->SoundManager.StopMusic("level1ogg.ogg"); -//#endif - TrySaveGame(); - DisapplySignalsToGame(); - ApplySignalsToMenu(); - GameState = CONST_GAMESTATE_MENU; - OnDrawSignal.disconnect(boost::bind(&TGameLevel::Draw, boost::ref(GameLevel))); -} - -void TMyApplication::GoFromMenuToCredits() -{ - GameState = CONST_GAMESTATE_FROM_MENU_TO_CREDITS; - StateTimer = CONST_CREDITS_SHOW_TIME; - GameCredits.StartAppear(); - OnDrawSignal.connect(1, boost::bind(&TGameCredits::Draw, boost::ref(GameCredits))); - DisapplySignalsToMenu(); - -} - -void TMyApplication::GoFromCreditsToMenu() -{ - - GameState = CONST_GAMESTATE_FROM_CREDITS_TO_MENU; - StateTimer = CONST_CREDITS_SHOW_TIME; - GameCredits.StartDisappear(); - OnDrawSignal.connect(0, boost::bind(&TGameMenu::Draw, boost::ref(Menu))); - - DisapplySignalsToCredits(); -} - -void TMyApplication::MarkSetGameLevelPause() -{ - OnDrawSignal.connect(0, boost::bind(&TGameMenu::Draw, boost::ref(Menu))); -} - -void TMyApplication::MarkReleaseGameLevelPause() -{ - OnDrawSignal.disconnect(boost::bind(&TGameMenu::Draw, boost::ref(Menu))); -} - - -void TMyApplication::OpenNextLevel() -{ - Menu.OpenNextLevel(); } bool TMyApplication::IsLoaded() diff --git a/game/main_code.h b/game/main_code.h index 6efa645..5150d85 100644 --- a/game/main_code.h +++ b/game/main_code.h @@ -24,93 +24,18 @@ #include "boost/signals2.hpp"//Signal must be included after asio -#include "gamecode.h" -#include "menucode.h" -#include "creditscode.h" -#include "loadingcode.h" - using namespace SE; - -extern boost::signals2::signal OnTapUpSignal; -extern boost::signals2::signal OnTapUpAfterMoveSignal; - -extern boost::signals2::signal OnTapDownSignal; -extern boost::signals2::signal OnFlingSignal; -extern boost::signals2::signal OnScrollSignal; - -extern boost::signals2::signal OnDrawSignal; - -extern const std::string CONST_BLOCK_TEXTURE1; -extern const std::string CONST_BLOCK_TEXTURE2; -extern const std::string CONST_BLOCK_TEXTURE3; - -extern const std::string CONST_BONUS_GOTHROUGH_TEXTURE; -extern const std::string CONST_BONUS_MULTIPLIER_TEXTURE; -extern const std::string CONST_BONUS_FLOOR_TEXTURE; - -extern const std::string CONST_BALL_TEXTURE; -extern const std::string CONST_BALLGLOW_TEXTURE; - -extern const std::string CONST_WALL_LEFT_TEXTURE; -extern const std::string CONST_WALL_RIGHT_TEXTURE; -extern const std::string CONST_WALL_UP_TEXTURE; -extern const std::string CONST_WALL_BONUS_TEXTURE; - - -extern const std::string CONST_REFLECTOR_TEXTURE; - -extern const std::string CONST_BACK_BTN_TEXTURE; - -extern const std::string CONST_SLIDE_UP_BTN_TEXTURE; -extern const std::string CONST_TAP_TO_CONTINUE_BTN_TEXTURE; - -extern const std::string CONST_BACK_BTN_TEXTURE; -extern const std::string CONST_SLIDE_UP_BTN_TEXTURE; -extern const std::string CONST_TAP_TO_CONTINUE_BTN_TEXTURE; -extern const std::string CONST_LOADING_TEXTURE; -extern const std::string CONST_LOGO_SMALL_TEXTURE; -extern const std::string CONST_LOADING_BACKGROUND_BLACK; -extern const std::string CONST_CREDITS_TEXTURE; - - - -const int CONST_GAMESTATE_LEVEL = 1; -const int CONST_GAMESTATE_MENU = 0; -const int CONST_GAMESTATE_FROM_MENU_TO_LEVEL = 2; -const int CONST_GAMESTATE_FROM_MENU_TO_CREDITS = 3; -const int CONST_GAMESTATE_CREDITS = 4; -const int CONST_GAMESTATE_FROM_CREDITS_TO_MENU = 5; -const int CONST_GAMESTATE_LOADING = 6; -const int CONST_GAMESTATE_PRELOADING = 7; - - class TMyApplication : public TApplication { protected: - TGameMenu Menu; - TGameLevel GameLevel; - TGameCredits GameCredits; - TGameLoading GameLoading; - - int GameState; - float StateTimer; - - void TryLoadSavedGame(); - void TrySaveGame(); bool Inited; - std::vector > TextureNamesToLoad; - - void ApplySignalsToMenu(); - void DisapplySignalsToMenu(); - void ApplySignalsToGame(); - void DisapplySignalsToGame(); - void ApplySignalsToCredits(); - void DisapplySignalsToCredits(); - public: + TRenderPair pair; + TRenderPair rect; + bool Loaded; TMyApplication() : TApplication(), Loaded(false), Inited(false) { } @@ -123,20 +48,10 @@ public: virtual void InnerUpdate(size_t dt); - void GoFromMenuToGame(int level); - void GoFromGameToMenu(); - void GoFromMenuToCredits(); - void GoFromCreditsToMenu(); - void MarkSetGameLevelPause(); - void MarkReleaseGameLevelPause(); - - void OpenNextLevel(); - bool IsLoaded(); bool IsInited(); - void LoadResources(); virtual void InnerOnTapDown(Vector2f p); diff --git a/windows/DoubleHitBalls-win/DoubleHitBalls-win/DoubleHitBalls-win.vcxproj b/windows/DoubleHitBalls-win/DoubleHitBalls-win/DoubleHitBalls-win.vcxproj index 10d27de..4af150b 100755 --- a/windows/DoubleHitBalls-win/DoubleHitBalls-win/DoubleHitBalls-win.vcxproj +++ b/windows/DoubleHitBalls-win/DoubleHitBalls-win/DoubleHitBalls-win.vcxproj @@ -116,7 +116,7 @@ Windows true - ../../../game;../../../../tes-engine;../../../../eigen;../../../../boost_1_63_0/;../../../../boost_1_63_0/bin.v2/libs/system/build/msvc-14.0/debug/address-model-64/link-static/threading-multi;../../../../boost_1_63_0/bin.v2/libs/date_time/build/msvc-14.0/debug/address-model-64/link-static/threading-multi/;../../../../boost_1_63_0/bin.v2/libs/regex/build/msvc-14.0/debug/address-model-64/link-static/threading-multi;../../../../boost_1_63_0/bin.v2/libs/thread/build/msvc-14.0/debug/address-model-64/link-static/threading-multi;../../../../boost_1_63_0/bin.v2/libs/chrono/build/msvc-14.0/debug/address-model-64/link-static/threading-multi;../../../../boost_1_63_0/bin.v2/libs/signals/build/msvc-14.0/debug/address-model-64/link-static/threading-multi;../../../../libs/boost-gil-extension;../../../../libs/jpeg-9;../../../../libs/jpeg-9/vc10;../../../../libs/lpng1510;../x64/Debug + ../../../game;../../../../tes-engine;../../../../eigen;../../../../boost_1_63_0/stage/x64/lib;../../../../boost_1_63_0/bin.v2/libs/system/build/msvc-14.0/debug/address-model-64/link-static/threading-multi;../../../../boost_1_63_0/bin.v2/libs/date_time/build/msvc-14.0/debug/address-model-64/link-static/threading-multi/;../../../../boost_1_63_0/bin.v2/libs/regex/build/msvc-14.0/debug/address-model-64/link-static/threading-multi;../../../../boost_1_63_0/bin.v2/libs/thread/build/msvc-14.0/debug/address-model-64/link-static/threading-multi;../../../../boost_1_63_0/bin.v2/libs/chrono/build/msvc-14.0/debug/address-model-64/link-static/threading-multi;../../../../boost_1_63_0/bin.v2/libs/signals/build/msvc-14.0/debug/address-model-64/link-static/threading-multi;../../../../libs/boost-gil-extension;../../../../libs/jpeg-9;../../../../libs/jpeg-9/vc10;../../../../libs/lpng1510;../x64/Debug 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) @@ -158,25 +158,16 @@ 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/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.filters b/windows/DoubleHitBalls-win/DoubleHitBalls-win/DoubleHitBalls-win.vcxproj.filters index b4ac7b9..55c6552 100755 --- a/windows/DoubleHitBalls-win/DoubleHitBalls-win/DoubleHitBalls-win.vcxproj.filters +++ b/windows/DoubleHitBalls-win/DoubleHitBalls-win/DoubleHitBalls-win.vcxproj.filters @@ -21,18 +21,6 @@ Файлы исходного кода - - Файлы исходного кода - - - Файлы исходного кода - - - Файлы исходного кода - - - Файлы исходного кода - @@ -41,20 +29,5 @@ Заголовочные файлы - - Заголовочные файлы - - - Заголовочные файлы - - - Заголовочные файлы - - - Заголовочные файлы - - - Заголовочные файлы - \ No newline at end of file diff --git a/windows/DoubleHitBalls-win/DoubleHitBalls-win/main.cpp b/windows/DoubleHitBalls-win/DoubleHitBalls-win/main.cpp index 3f248c6..6000e5a 100755 --- a/windows/DoubleHitBalls-win/DoubleHitBalls-win/main.cpp +++ b/windows/DoubleHitBalls-win/DoubleHitBalls-win/main.cpp @@ -8,8 +8,8 @@ int APIENTRY WinMain(HINSTANCE hCurrentInst, HINSTANCE hPreviousInst, LPSTR lpszCmdLine, int nCmdShow) { - int width = 480; - int height = 320; + int width = 512; + int height = 512; if (CreateEngine(width, height))