Ticket #1886: CGameView_without_CJSObject_1.diff

GameView.cpp

@@ -54 +54 @@
 #include "ps/World.h"
 #include "renderer/Renderer.h"
 #include "renderer/WaterManager.h"
-#include "scripting/ScriptableObject.h"
 #include "simulation2/Simulation2.h"
 #include "simulation2/components/ICmpPosition.h"
 #include "simulation2/components/ICmpRangeManager.h"
@@ -148 +147 @@
     float m_Smoothness;
 };
 
-class CGameViewImpl : public CJSObject<CGameViewImpl>
+class CGameViewImpl
 {
     NONCOPYABLE(CGameViewImpl);
 public:
@@ -160 +159 @@
         TerritoryTexture(*game->GetSimulation2()),
         ViewCamera(),
         CullCamera(),
-        LockCullCamera(false),
-        ConstrainCamera(true),
-        Culling(true),
         FollowEntity(INVALID_ENTITY),
         FollowFirstPerson(false),
 
@@ -234 +230 @@
      *
      * Exposed to JS as gameView.lockCullCamera
      */
-    bool LockCullCamera;
+    static bool m_LockCullCamera;
 
     /**
      * When @c true, culling is enabled so that only models that have a chance of
@@ -243 +239 @@
      *
      * Exposed to JS as gameView.culling
      */
-    bool Culling;
+    static bool m_Culling;
 
     /**
      * Whether the camera movement should be constrained by min/max limits
      * and terrain avoidance.
      */
-    bool ConstrainCamera;
+    static bool m_ConstrainCamera;
 
     /**
      * Cache global lighting environment. This is used  to check whether the
@@ -309 +305 @@
     CSmoothedValue RotateX; // inclination around x axis (relative to camera)
     CSmoothedValue RotateY; // rotation around y (vertical) axis
 
-    static void ScriptingInit();
+    static void RegisterScriptFunctions(ScriptInterface& scriptInterface);
+    static void SetCulling(ScriptInterface* UNUSED(ScriptInterface), void* UNUSED(cbdata), bool Enabled) { CGameViewImpl::m_Culling = Enabled; }
+    static void LockCullCamera(ScriptInterface* UNUSED(ScriptInterface), void* UNUSED(cbdata), bool Enabled) { CGameViewImpl::m_LockCullCamera = Enabled; }
+    static void ConstrainCamera(ScriptInterface* UNUSED(ScriptInterface), void* UNUSED(cbdata), bool Enabled) { CGameViewImpl::m_ConstrainCamera = Enabled; }
+
 };
 
+bool CGameViewImpl::m_LockCullCamera = false;
+bool CGameViewImpl::m_ConstrainCamera = true;
+bool CGameViewImpl::m_Culling = true;
+
 static void SetupCameraMatrixSmooth(CGameViewImpl* m, CMatrix3D* orientation)
 {
     orientation->SetIdentity();
@@ -372 +376 @@
     return m->ObjectManager;
 }
 
-JSObject* CGameView::GetScript()
-{
-    return m->GetScript();
-}
+//JSObject* CGameView::GetScript()
+//{
+//  return m->GetScript();
+//}
 
-/*static*/ void CGameView::ScriptingInit()
-{
-    return CGameViewImpl::ScriptingInit();
-}
-
 CCamera* CGameView::GetCamera()
 {
     return &m->ViewCamera;
@@ -402 +401 @@
     return m->TerritoryTexture;
 }
 
-
-void CGameViewImpl::ScriptingInit()
+void CGameViewImpl::RegisterScriptFunctions(ScriptInterface& scriptInterface)
 {
-    AddProperty(L"culling", &CGameViewImpl::Culling);
-    AddProperty(L"lockCullCamera", &CGameViewImpl::LockCullCamera);
-    AddProperty(L"constrainCamera", &CGameViewImpl::ConstrainCamera);
-
-    CJSObject<CGameViewImpl>::ScriptingInit("GameView");
+    scriptInterface.RegisterFunction<void, bool, &CGameViewImpl::SetCulling>("GameView_SetCulling");
+    scriptInterface.RegisterFunction<void, bool, &CGameViewImpl::LockCullCamera>("GameView_LockCullCamera");
+    scriptInterface.RegisterFunction<void, bool, &CGameViewImpl::ConstrainCamera>("GameView_ConstrainCamera");
 }
 
 int CGameView::Initialize()
@@ -526 +522 @@
                 bounds[1].Y = waterHeight;
             }
 
-            if (!m->Culling || frustum.IsBoxVisible (CVector3D(0,0,0), bounds)) {
+            if (!m->m_Culling || frustum.IsBoxVisible (CVector3D(0,0,0), bounds)) {
                 //c->Submit(patch);
 
                 // set the renderstate for this patch
@@ -577 +573 @@
     }
     }
 
-    m->Game->GetSimulation2()->RenderSubmit(*c, frustum, m->Culling);
+    m->Game->GetSimulation2()->RenderSubmit(*c, frustum, m->m_Culling);
 }