Ticket #2913: Hack_CCmpVisibilityScripted_IsActive_0.1.diff

source/simulation2/Simulation2.cpp

@@ -40 +40 @@
 #include "ps/Filesystem.h"
 #include "ps/Loader.h"
 #include "ps/Profile.h"
+#include "ps/ProfileViewer.h"
 #include "ps/Pyrogenesis.h"
 #include "ps/XML/Xeromyces.h"
 
@@ -458 +459 @@
 
     if (m_EnableOOSLog)
         DumpState();
+        
+    if (m_TurnNumber % 1 == 0)
+        g_ProfileViewer.SaveToFile();
 
     // Start computing AI for the next turn
     CmpPtr<ICmpAIManager> cmpAIManager(m_SimContext, SYSTEM_ENTITY);

source/simulation2/components/CCmpAIManager.cpp

@@ -890 +890 @@
         // AI players can cheat and see through FoW/SoD, since that greatly simplifies
         // their implementation.
         // (TODO: maybe cleverer AIs should be able to optionally retain FoW/SoD)
-        CmpPtr<ICmpRangeManager> cmpRangeManager(GetSystemEntity());
-        if (cmpRangeManager)
-            cmpRangeManager->SetLosRevealAll(player, true);
+        //CmpPtr<ICmpRangeManager> cmpRangeManager(GetSystemEntity());
+        //if (cmpRangeManager)
+        //  cmpRangeManager->SetLosRevealAll(player, true);
     }
     
     virtual void SetRNGSeed(uint32_t seed)

source/simulation2/components/CCmpRangeManager.cpp

@@ -1544 +1544 @@
     {
         PROFILE("UpdateVisibilityData");
         
-        for (i32 n = 0; n < m_LosTilesPerSide*m_LosTilesPerSide; ++n)
         {
-            if (m_DirtyVisibility[n] == 1 || m_GlobalVisibilityUpdate)
+            float dirty = 0;
+            float valid = 0;
+            PROFILE("UpdateVisibilityData1");
+            for (i32 n = 0; n < m_LosTilesPerSide*m_LosTilesPerSide; ++n)
             {
-                for (std::set<entity_id_t>::iterator it = m_LosTiles[n].begin();
-                    it != m_LosTiles[n].end();
-                    ++it)
+                if (m_DirtyVisibility[n] == 1)
+                    dirty++;
+                else
+                    valid++;
+                if (m_DirtyVisibility[n] == 1 || m_GlobalVisibilityUpdate)
                 {
-                    UpdateVisibility(*it);
+                    for (std::set<entity_id_t>::iterator it = m_LosTiles[n].begin();
+                        it != m_LosTiles[n].end();
+                        ++it)
+                    {
+                        UpdateVisibility(*it);
+                    }
+                    m_DirtyVisibility[n] = 0;
                 }
-                m_DirtyVisibility[n] = 0;
             }
+            std::cout << "dirty: " << 100/(valid+dirty)*dirty << "%" << std::endl;
+            //std::cout << "dirty: " << dirty << " \t valid: " << valid << std::endl;
         }
+        
 
-        for (std::vector<entity_id_t>::iterator it = m_ModifiedEntities.begin(); it != m_ModifiedEntities.end(); ++it)
         {
-            // Don't bother updating if we already did it in a global update
-            if (!m_GlobalVisibilityUpdate)
-                UpdateVisibility(*it);
+            PROFILE("UpdateVisibilityData2");
+            for (std::vector<entity_id_t>::iterator it = m_ModifiedEntities.begin(); it != m_ModifiedEntities.end(); ++it)
+            {
+                // Don't bother updating if we already did it in a global update
+                if (!m_GlobalVisibilityUpdate)
+                    UpdateVisibility(*it);
+            }
         }
         m_ModifiedEntities.clear();
 

source/simulation2/components/ICmpVisibility.cpp

@@ -28 +28 @@
 class CCmpVisibilityScripted : public ICmpVisibility
 {
 public:
-    DEFAULT_SCRIPT_WRAPPER(VisibilityScripted)
+    DEFAULT_SCRIPT_WRAPPER_NO_CTOR(VisibilityScripted)
+    
+    CCmpVisibilityScripted(ScriptInterface& scriptInterface, JS::HandleValue instance) : 
+        m_Script(scriptInterface, instance),
+        m_IsActivated(false)
+    { }
+    
+    virtual void Init(const CParamNode& paramNode)
+    {
+        m_Script.Init(paramNode, GetEntityId());
+        m_IsActivated = m_Script.Call<bool>("IsActivated");
+    }
 
     virtual bool IsActivated()
     {
-        return m_Script.Call<bool>("IsActivated");
+        return m_IsActivated;
+        //return m_Script.Call<bool>("IsActivated");
     }
 
     virtual ICmpRangeManager::ELosVisibility GetVisibility(player_id_t player, bool isVisible, bool isExplored)
@@ -62 +74 @@
     {
         return m_Script.Call<bool>("GetAlwaysVisible");
     }
+private:
+    bool m_IsActivated;
 };
 
 REGISTER_COMPONENT_SCRIPT_WRAPPER(VisibilityScripted)

source/simulation2/system/Component.h

@@ -48 +48 @@
     { \
         return CID_##cname; \
     }
+    
+#define DEFAULT_SCRIPT_WRAPPER(cname) \
+    CCmp##cname(ScriptInterface& scriptInterface, JS::HandleValue instance) : m_Script(scriptInterface, instance) { } \
+    virtual void Init(const CParamNode& paramNode) \
+    { \
+        m_Script.Init(paramNode, GetEntityId()); \
+    } \
+    DEFAULT_SCRIPT_WRAPPER_NO_CTOR(cname);
 
-#define DEFAULT_SCRIPT_WRAPPER(cname) \
+#define DEFAULT_SCRIPT_WRAPPER_NO_CTOR(cname) \
     static void ClassInit(CComponentManager& UNUSED(componentManager)) { } \
     static IComponent* Allocate(ScriptInterface& scriptInterface, JS::HandleValue instance) \
     { \
@@ -59 +67 @@
     { \
         delete static_cast<CCmp##cname*> (cmp); \
     } \
-    CCmp##cname(ScriptInterface& scriptInterface, JS::HandleValue instance) : m_Script(scriptInterface, instance) { } \
     static std::string GetSchema() \
     { \
         return "<a:component type='script-wrapper'/><empty/>"; \
     } \
-    virtual void Init(const CParamNode& paramNode) \
-    { \
-        m_Script.Init(paramNode, GetEntityId()); \
-    } \
     virtual void Deinit() \
     { \
         m_Script.Deinit(); \