refined mugshot camera

don't increase skins pot on final hole repeat
fallahn · Aug 28, 2023 · ada0a33 · ada0a33
1 parent 3dd14bc
commit ada0a33
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 7 deletions.
diff --git a/samples/golf/buildnumber.h b/samples/golf/buildnumber.h
@@ -3,7 +3,7 @@
 #ifndef BUILD_NUMBER_H_ 
 #define BUILD_NUMBER_H_ 
 
-#define BUILDNUMBER 1447
-#define BUILDNUMBER_STR "1447" 
+#define BUILDNUMBER 1462
+#define BUILDNUMBER_STR "1462" 
 
 #endif /* BUILD_NUMBER_H_ */
diff --git a/samples/golf/src/golf/GolfState.cpp b/samples/golf/src/golf/GolfState.cpp
@@ -5993,6 +5993,14 @@ void GolfState::handleBullHit(const BullHit& bh)
             floatingMessage("Target Hit!");
         }
     }
+    else if (!m_sharedData.connectionData[bh.client].playerData[bh.player].targetHit)
+    {
+        auto* msg = postMessage<GolfEvent>(MessageID::GolfMessage);
+        msg->type = GolfEvent::TargetHit;
+        msg->position = bh.position;
+
+        floatingMessage("Target Hit!");
+    }
 
     //hide the target
     cro::Command cmd;

diff --git a/samples/golf/src/golf/ProfileState.cpp b/samples/golf/src/golf/ProfileState.cpp
@@ -109,7 +109,7 @@ namespace
     constexpr glm::vec3 CameraBasePosition({ -0.867f, 1.325f, -1.68f });
     constexpr glm::vec3 CameraZoomPosition({ -0.867f, 1.625f, -0.58f });
     const glm::vec3 CameraZoomVector = glm::normalize(CameraZoomPosition - CameraBasePosition);
-    constexpr glm::vec3 MugCameraPosition({ -0.854f, 1.6f, -0.32f });
+    constexpr glm::vec3 MugCameraPosition({ -0.843f, 1.61f, -0.35f });
 
     const cro::String XboxString("LB/LT - RB/RT Rotate/Zoom");
     const cro::String PSString("L1/L2 - R1/R2 Rotate/Zoom");
@@ -1708,9 +1708,9 @@ void ProfileState::buildPreviewScene()
     m_cameras[CameraID::Mugshot] = m_modelScene.createEntity();
     m_cameras[CameraID::Mugshot].addComponent<cro::Transform>().setPosition(MugCameraPosition);
     m_cameras[CameraID::Mugshot].getComponent<cro::Transform>().setRotation(cro::Transform::Y_AXIS, cro::Util::Const::PI);
-    //m_cameras[CameraID::Mugshot].getComponent<cro::Transform>().rotate(cro::Transform::X_AXIS, -0.157f);
+    m_cameras[CameraID::Mugshot].getComponent<cro::Transform>().rotate(cro::Transform::X_AXIS, -0.057f);
     auto& cam2 = m_cameras[CameraID::Mugshot].addComponent<cro::Camera>();
-    cam2.setPerspective(70.f * cro::Util::Const::degToRad, 1.f, 0.1f, 6.f);
+    cam2.setPerspective(60.f * cro::Util::Const::degToRad, 1.f, 0.1f, 6.f);
     cam2.viewport = { 0.f, 0.f, 0.5f, 1.f };
     cam2.renderFlags = ~(1 << 1);
 
@@ -2458,7 +2458,7 @@ void ProfileState::generateMugshot()
     m_modelScene.render();
 
     cam.viewport = { 0.5f, 0.f, 0.5f, 1.f };
-    m_cameras[CameraID::Mugshot].getComponent<cro::Transform>().setPosition(MugCameraPosition + glm::vec3(-MugCameraPosition.z + 0.05f, 0.f, -MugCameraPosition.z));
+    m_cameras[CameraID::Mugshot].getComponent<cro::Transform>().setPosition(MugCameraPosition + glm::vec3(-MugCameraPosition.z /*+ 0.05f*/, 0.f, -MugCameraPosition.z));
     m_cameras[CameraID::Mugshot].getComponent<cro::Transform>().setRotation(cro::Transform::Y_AXIS, cro::Util::Const::PI / 2.f);
     m_cameras[CameraID::Mugshot].getComponent<cro::Camera>().updateMatrices(m_cameras[CameraID::Mugshot].getComponent<cro::Transform>());
     m_modelScene.render();

diff --git a/samples/golf/src/golf/server/ServerGolfRules.cpp b/samples/golf/src/golf/server/ServerGolfRules.cpp
@@ -190,7 +190,10 @@ bool GolfState::summariseRules()
         }
         else //increase the skins pot, but only if not repeating the final hole else we'll be here forever...
         {
-            m_skinsPot++;
+            if (!m_skinsFinals)
+            {
+                m_skinsPot++;
+            }
             std::uint16_t data = 0xff00 | m_skinsPot;
             m_sharedData.host.broadcastPacket(PacketID::HoleWon, data, net::NetFlag::Reliable, ConstVal::NetChannelReliable);
         }