diff --git a/assets/textures/sign-thanks-diffuse.png b/assets/textures/sign-thanks-diffuse.png index 33bcb2c..ecc9978 100644 Binary files a/assets/textures/sign-thanks-diffuse.png and b/assets/textures/sign-thanks-diffuse.png differ diff --git a/src/JamSpookGame.cpp b/src/JamSpookGame.cpp index 0e60f4e..c660bc9 100644 --- a/src/JamSpookGame.cpp +++ b/src/JamSpookGame.cpp @@ -31,7 +31,7 @@ JamSpookGame::JamSpookGame(): // Create window // Resolution (256x224 scaled to whatever) Log::write(LogLevel::info, "Game - Constructor - Creating window"); - mWindow = make_shared("BouncyBalls", 480, 272, Window::WindowMode::window); + mWindow = make_shared("Spooky Game", 480, 272, Window::WindowMode::window); mWindow->hide(); // Create renderer @@ -264,7 +264,7 @@ void JamSpookGame::set() trackPieceFactory->createSign("ThankYouSign", "sign-thanks-diffuse.png", vec3(994, 0, 1000), - quat(vec3(radians(0.0f), radians(60.0f), radians(0.0f)))); + quat(vec3(radians(0.0f), radians(90.0f), radians(0.0f)))); trackPieceFactory.reset(); @@ -308,8 +308,9 @@ void JamSpookGame::set() cameraFactory->createActiveFollowCamera("followKartCamera", mCamera, kartEntity, - vec3(0 ,10 ,-25), - vec3(0, 5, 0)); + vec3(0 ,35 ,-25), + vec3(0, 5, 0), + bvec3(0, 0, 0)); shared_ptr endSceneCamera = cameraFactory->createStaticCamera("endSceneCamera", mCameraEndScene); @@ -324,14 +325,14 @@ void JamSpookGame::set() dynamic_pointer_cast(findSystem(IDCache::get("PhysicsSystem"))), renderLayerGame); -// shared_ptr endGameEntity = resetTriggerFactory-> -// createResetTrigger(vec3(-1, -30, -12), -// vec3(1)); - shared_ptr endGameEntity = resetTriggerFactory-> - createResetTrigger(vec3(0, 0, 0), + createResetTrigger(vec3(-1, -30, -12), vec3(1)); +// shared_ptr endGameEntity = resetTriggerFactory-> +// createResetTrigger(vec3(0, 0, 0), +// vec3(1)); + // Add the leaking ICCResponse component to // ContactWithPlayer weak_ptr wGraphicsSystem = graphicsSystem; weak_ptr wEndSceneCamera = mCameraEndScene; diff --git a/src/JamSpookGame.h b/src/JamSpookGame.h index 719f0bc..7a495c0 100644 --- a/src/JamSpookGame.h +++ b/src/JamSpookGame.h @@ -87,6 +87,7 @@ using std::to_string; using glm::ivec2; using glm::vec2; +using glm::bvec3; using glm::vec3; using glm::vec4; using glm::mat4;