Browse Source

Disable old sandbox state in preparation to completely switching to the FSM system

master
C. J. Howard 5 years ago
parent
commit
499f5ce211
Signed by: cjhoward GPG Key ID: 03E1FABA9C3EC195
2 changed files with 9 additions and 4 deletions
  1. +9
    -1
      src/game.cpp
  2. +0
    -3
      src/game.hpp

+ 9
- 1
src/game.cpp View File

@ -109,6 +109,14 @@ Game::Game(int argc, char* argv[]):
toggleFullscreenDisabled = false;
sandboxState = new SandboxState(this);
float3x3 m1;
float3x3 m2;
float3x3 m3 = m1 + m2;
float3x3 m4 = m2 - m3;
float4x4 projection = perspective(radians(45.0f), 3.0f / 4.0f, -1.0f, 1.0f);
float4x4 ortho_proj = ortho(-1.0f, 1.0f, -1.0f, 1.0f, -1.0f, 1.0f);
}
Game::~Game()
@ -611,7 +619,7 @@ void Game::setup()
#endif
}
changeState(sandboxState);
//changeState(sandboxState);
}
void Game::update(float t, float dt)

+ 0
- 3
src/game.hpp View File

@ -480,14 +480,11 @@ public:
// Animation
Animator animator;
Animation<float> antHillZoomAnimation;
AnimationClip<float> antHillZoomClip;
Animation<float> menuFadeAnimation;
AnimationClip<float> menuFadeInClip;
AnimationClip<float> menuFadeOutClip;
Animation<float> splashFadeInAnimation;
Animation<float> splashFadeOutAnimation;
AnimationClip<float> splashFadeInClip;

Loading…
Cancel
Save