fix world space position of point light lens flares

fallahn · Sep 2, 2024 · 837f29b · 837f29b
1 parent 58f6ce6
commit 837f29b
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/crogine.sln b/crogine.sln
@@ -703,8 +703,8 @@ Global
 		{B1559428-CDF8-4797-8766-0EA62BDD6D1B}.Release|Any CPU.ActiveCfg = Release|Win32
 		{B1559428-CDF8-4797-8766-0EA62BDD6D1B}.Release|ARM.ActiveCfg = Release|Win32
 		{B1559428-CDF8-4797-8766-0EA62BDD6D1B}.Release|ARM64.ActiveCfg = Release|Win32
-		{B1559428-CDF8-4797-8766-0EA62BDD6D1B}.Release|x64.ActiveCfg = Release|x64
-		{B1559428-CDF8-4797-8766-0EA62BDD6D1B}.Release|x64.Build.0 = Release|x64
+		{B1559428-CDF8-4797-8766-0EA62BDD6D1B}.Release|x64.ActiveCfg = ReleaseGNS|x64
+		{B1559428-CDF8-4797-8766-0EA62BDD6D1B}.Release|x64.Build.0 = ReleaseGNS|x64
 		{B1559428-CDF8-4797-8766-0EA62BDD6D1B}.Release|x86.ActiveCfg = Release|Win32
 		{B1559428-CDF8-4797-8766-0EA62BDD6D1B}.Release|x86.Build.0 = Release|Win32
 		{B1559428-CDF8-4797-8766-0EA62BDD6D1B}.Release-asan|Any CPU.ActiveCfg = Release-asan|Win32

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 7142
-#define BUILDNUMBER_STR "7142" 
+#define BUILDNUMBER 7145
+#define BUILDNUMBER_STR "7145" 
 
 #endif /* BUILD_NUMBER_H_ */
diff --git a/samples/golf/src/golf/GolfState.cpp b/samples/golf/src/golf/GolfState.cpp
@@ -3859,6 +3859,9 @@ void GolfState::spawnBall(const ActorInfo& info)
             entity.getComponent<cro::LightVolume>().colour = miniBallColour.getVec4() / 2.f;
             entity.getComponent<cro::Model>().setHidden(true);
 
+            //hack to stop the point light lens flares drawing on balls
+            entity.addComponent<LightAnimation>().pattern.clear();
+
             ballEnt.getComponent<cro::Transform>().addChild(entity.getComponent<cro::Transform>());
         }
     }

diff --git a/samples/golf/src/golf/GolfStateCameras.cpp b/samples/golf/src/golf/GolfStateCameras.cpp
@@ -2115,7 +2115,7 @@ void GolfState::updatePointFlares(cro::Entity e, float)
         static constexpr float MaxLightDist = 50.f;
         static constexpr float MaxLightDistSqr = MaxLightDist * MaxLightDist;
 
-        const auto lightPos = light.getComponent<cro::Transform>().getPosition();
+        const auto lightPos = light.getComponent<cro::Transform>().getWorldPosition();
         if (glm::length2(lightPos - camPosition) > MaxLightDistSqr)
         {
             //skip lights further than max dist
@@ -2142,7 +2142,7 @@ void GolfState::updatePointFlares(cro::Entity e, float)
 
                 cro::Colour c(depthUV.x, depthUV.y, ndc.z / ndc.w, Brightness);
                 const auto pos = (screenPos * OutputSize) + OutputSize;
-                const float Scale = 1.f - (glm::length(lightPos - camPosition) / MaxLightDist);
+                const float Scale = (1.f - (glm::length(lightPos - camPosition) / MaxLightDist)) * light.getComponent<cro::Transform>().getWorldScale().x;
 
                 addQuad(glm::vec2(Scale) * m_viewScale.x, pos, c);
             }