Ticket #1886: CGameView_without_CJSObject_2.diff

GameView.cpp

@@ -34 +34 @@
 #include "graphics/TerritoryTexture.h"
 #include "graphics/Unit.h"
 #include "graphics/UnitManager.h"
+#include "graphics/scripting/JSInterface_GameView.h"
 #include "lib/input.h"
 #include "lib/timer.h"
 #include "maths/BoundingBoxAligned.h"
@@ -54 +55 @@
 #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 +148 @@
     float m_Smoothness;
 };
 
-class CGameViewImpl : public CJSObject<CGameViewImpl>
+class CGameViewImpl
 {
     NONCOPYABLE(CGameViewImpl);
 public:
@@ -160 +160 @@
         TerritoryTexture(*game->GetSimulation2()),
         ViewCamera(),
         CullCamera(),
+        FollowEntity(INVALID_ENTITY),
+        FollowFirstPerson(false),
         LockCullCamera(false),
         ConstrainCamera(true),
         Culling(true),
-        FollowEntity(INVALID_ENTITY),
-        FollowFirstPerson(false),
 
         // Dummy values (these will be filled in by the config file)
         ViewScrollSpeed(0),
@@ -308 +308 @@
     CSmoothedValue Zoom;
     CSmoothedValue RotateX; // inclination around x axis (relative to camera)
     CSmoothedValue RotateY; // rotation around y (vertical) axis
-
-    static void ScriptingInit();
 };
 
+#define BLN_GET_SET(NAME) \
+bool CGameView::Get##NAME##Enabled() \
+{ \
+    return m->NAME; \
+} \
+\
+void CGameView::Set##NAME##Enabled(bool Enabled) \
+{ \
+    m->NAME = Enabled; \
+}
+
+BLN_GET_SET(Culling);
+BLN_GET_SET(LockCullCamera);
+BLN_GET_SET(ConstrainCamera);
+
+#undef BLN_GET_SET
+
 static void SetupCameraMatrixSmooth(CGameViewImpl* m, CMatrix3D* orientation)
 {
     orientation->SetIdentity();
@@ -372 +387 @@
     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 +412 @@
     return m->TerritoryTexture;
 }
 
+#define REG_BLN_GET_SET(NAME) \
+scriptInterface.RegisterFunction<bool, &JSI_GameView::Get##NAME##Enabled>("GameView_Get##NAME##Enabled"); \
+scriptInterface.RegisterFunction<void, bool, &JSI_GameView::Set##NAME##Enabled>("GameView_Set##NAME##Enabled");
 
-void CGameViewImpl::ScriptingInit()
+void CGameView::RegisterScriptFunctions(ScriptInterface& scriptInterface)
 {
-    AddProperty(L"culling", &CGameViewImpl::Culling);
-    AddProperty(L"lockCullCamera", &CGameViewImpl::LockCullCamera);
-    AddProperty(L"constrainCamera", &CGameViewImpl::ConstrainCamera);
-
-    CJSObject<CGameViewImpl>::ScriptingInit("GameView");
+    REG_BLN_GET_SET(Culling);
+    REG_BLN_GET_SET(LockCullCamera);
+    REG_BLN_GET_SET(ConstrainCamera);
 }
 
+#undef REG_BLN_GET_SET
+
 int CGameView::Initialize()
 {
     CFG_GET_VAL("view.scroll.speed", Float, m->ViewScrollSpeed);

GameView.h

@@ -19 +19 @@
 #define INCLUDED_GAMEVIEW
 
 #include "renderer/Scene.h"
+#include "scriptinterface/ScriptInterface.h"
 #include "simulation2/system/Entity.h"
 
 #include "lib/input.h" // InReaction - can't forward-declare enum
@@ -94 +95 @@
     float GetFar() const;
     float GetFOV() const;
     float GetCullFOV() const;
+    
+    void RegisterScriptFunctions(ScriptInterface& scriptInterface);
+    
+    #define BLN_GET_SET(NAME) \
+    bool Get##NAME##Enabled(); \
+    void Set##NAME##Enabled(bool Enabled);
+    
+    BLN_GET_SET(Culling);
+    BLN_GET_SET(LockCullCamera);
+    BLN_GET_SET(ConstrainCamera);
+    
+    #undef BLN_GET_SET
 
+
     // Set projection of current camera using near, far, and FOV values
     void SetCameraProjection();
 
@@ -102 +116 @@
     CCinemaManager* GetCinema();
 
     JSObject* GetScript();
-    static void ScriptingInit();
 };
 extern InReaction game_view_handler(const SDL_Event_* ev);
 

scripting/JSInterface_GameView.cpp

@@ +1 @@
+/* Copyright (C) 2013 Wildfire Games.
+ * This file is part of 0 A.D.
+ *
+ * 0 A.D. is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * 0 A.D. is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with 0 A.D.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "precompiled.h"
+
+#include "JSInterface_GameView.h"
+#include "graphics/GameView.h"
+#include "ps/Game.h"
+
+#define BLN_GET_SET(NAME) \
+bool JSI_GameView::Get##NAME##Enabled(ScriptInterface* UNUSED(scriptInterface), void* UNUSED(cbdata)) \
+{ \
+    return g_Game->GetView()->Get##NAME##Enabled(); \
+} \
+\
+void JSI_GameView::Set##NAME##Enabled(ScriptInterface* UNUSED(scriptInterface), void* UNUSED(cbdata), bool Enabled) \
+{ \
+    g_Game->GetView()->Set##NAME##Enabled(Enabled); \
+}
+
+BLN_GET_SET(Culling);
+BLN_GET_SET(LockCullCamera);
+BLN_GET_SET(ConstrainCamera);
+
+

scripting/JSInterface_GameView.h

@@ +1 @@
+/* Copyright (C) 2013 Wildfire Games.
+ * This file is part of 0 A.D.
+ *
+ * 0 A.D. is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * 0 A.D. is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with 0 A.D.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#ifndef INCLUDED_JSINTERFACE_GAMEVIEW
+#define INCLUDED_JSINTERFACE_GAMEVIEW
+
+#include "ps/CStr.h"
+#include "scriptinterface/ScriptInterface.h"
+
+#define BLN_GET_SET(NAME) \
+    bool Get##NAME##Enabled(ScriptInterface* scriptInterface, void* cbdata); \
+    void Set##NAME##Enabled(ScriptInterface* scriptInterface, void* cbdata, bool Enabled);
+
+namespace JSI_GameView
+{
+    BLN_GET_SET(Culling);
+    BLN_GET_SET(LockCullCamera);
+    BLN_GET_SET(ConstrainCamera);
+}
+
+#undef BLN_GET_SET
+
+#endif