Changeset 9889 for ps

Timestamp:

07/20/11 21:48:06 (13 years ago)

Author:

philip

Message:

# Initial support for territories

Location:

ps/trunk

Files:

• binaries/data/mods/public/shaders/terrain_base.xml (modified) (2 diffs)
• binaries/data/mods/public/shaders/terrain_blend.xml (modified) (2 diffs)
• binaries/data/mods/public/shaders/terrain_common.fp (modified) (1 diff)
• binaries/data/mods/public/shaders/terrain_common.vp (modified) (2 diffs)
• binaries/data/mods/public/shaders/terrain_decal.xml (modified) (2 diffs)
• binaries/data/mods/public/simulation/components/interfaces/Settlement.js (deleted)
• binaries/data/mods/public/simulation/templates/special/territory_block.xml (added)
• binaries/data/mods/public/simulation/templates/special/territory_pull.xml (added)
• source/graphics/GameView.cpp (modified) (4 diffs)
• source/graphics/GameView.h (modified) (2 diffs)
• source/graphics/LOSTexture.cpp (modified) (1 diff)
• source/graphics/TerritoryTexture.cpp (added)
• source/graphics/TerritoryTexture.h (added)
• source/gui/MiniMap.cpp (modified) (3 diffs)
• source/renderer/Scene.h (modified) (2 diffs)
• source/renderer/TerrainRenderer.cpp (modified) (2 diffs)
• source/simulation2/Simulation2.cpp (modified) (1 diff)
• source/simulation2/TypeList.h (modified) (3 diffs)
• source/simulation2/components/CCmpTerritoryInfluence.cpp (added)
• source/simulation2/components/CCmpTerritoryManager.cpp (added)
• source/simulation2/components/ICmpObstruction.h (modified) (1 diff)
• source/simulation2/components/ICmpSettlement.cpp (added)
• source/simulation2/components/ICmpSettlement.h (added)
• source/simulation2/components/ICmpTerritoryInfluence.cpp (added)
• source/simulation2/components/ICmpTerritoryInfluence.h (added)
• source/simulation2/components/ICmpTerritoryManager.cpp (added)
• source/simulation2/components/ICmpTerritoryManager.h (added)
• source/tools/atlas/GameInterface/ActorViewer.cpp (modified) (4 diffs)

ps/trunk/binaries/data/mods/public/shaders/terrain_base.xml

@@ -6 +6 @@
         <uniform name="losTransform" loc="1" type="vec2"/>
         <uniform name="shadowTransform" loc="2" type="mat4"/>
+        <uniform name="territoryTransform" loc="6" type="vec2"/>
     </vertex>
 
@@ -12 +13 @@
         <uniform name="shadowTex" loc="2" type="sampler2DShadow"/>
         <uniform name="losTex" loc="3" type="sampler2D"/>
+        <uniform name="territoryTex" loc="4" type="sampler2D"/>
 
         <uniform name="ambient" loc="0" type="vec3"/>

ps/trunk/binaries/data/mods/public/shaders/terrain_blend.xml

@@ -8 +8 @@
         <uniform name="losTransform" loc="1" type="vec2"/>
         <uniform name="shadowTransform" loc="2" type="mat4"/>
+        <uniform name="territoryTransform" loc="6" type="vec2"/>
     </vertex>
 
@@ -15 +16 @@
         <uniform name="shadowTex" loc="2" type="sampler2DShadow"/>
         <uniform name="losTex" loc="3" type="sampler2D"/>
+        <uniform name="territoryTex" loc="4" type="sampler2D"/>
 
         <uniform name="ambient" loc="0" type="vec3"/>

ps/trunk/binaries/data/mods/public/shaders/terrain_common.fp

@@ -82 +82 @@
 #endif
 
+// Blend with the territory boundary texture
+TEX tex, fragment.texcoord[4], texture[4], 2D;
+LRP color.rgb, tex.a, tex, color;
+
 // Multiply everything by the LOS texture
 TEX tex.a, fragment.texcoord[3], texture[3], 2D;

ps/trunk/binaries/data/mods/public/shaders/terrain_common.vp

@@ -3 +3 @@
 PARAM losTransform = program.local[1];
 PARAM shadowTransform[4] = { program.local[2..5] };
+PARAM territoryTransform = program.local[6];
 
 TEMP lighting;
@@ -39 +40 @@
 
 MAD result.texcoord[3], position.xzzz, losTransform.x, losTransform.y;
+MAD result.texcoord[4], position.xzzz, territoryTransform.x, territoryTransform.y;
 
 END

ps/trunk/binaries/data/mods/public/shaders/terrain_decal.xml

@@ -8 +8 @@
         <uniform name="losTransform" loc="1" type="vec2"/>
         <uniform name="shadowTransform" loc="2" type="mat4"/>
+        <uniform name="territoryTransform" loc="6" type="vec2"/>
     </vertex>
 
@@ -14 +15 @@
         <uniform name="shadowTex" loc="2" type="sampler2DShadow"/>
         <uniform name="losTex" loc="3" type="sampler2D"/>
+        <uniform name="territoryTex" loc="4" type="sampler2D"/>
 
         <uniform name="ambient" loc="0" type="vec3"/>

ps/trunk/source/graphics/GameView.cpp

@@ -32 +32 @@
 #include "graphics/Terrain.h"
 #include "graphics/TerrainTextureManager.h"
+#include "graphics/TerritoryTexture.h"
 #include "graphics/Unit.h"
 #include "graphics/UnitManager.h"
@@ -160 +161 @@
         ObjectManager(MeshManager, SkeletonAnimManager, *game->GetSimulation2()),
         LOSTexture(*game->GetSimulation2()),
+        TerritoryTexture(*game->GetSimulation2()),
         ViewCamera(),
         CullCamera(),
@@ -205 +207 @@
     CObjectManager ObjectManager;
     CLOSTexture LOSTexture;
+    CTerritoryTexture TerritoryTexture;
 
     /**
@@ -382 +385 @@
 }
 
+CTerritoryTexture& CGameView::GetTerritoryTexture()
+{
+    return m->TerritoryTexture;
+}
+
 
 void CGameViewImpl::ScriptingInit()

ps/trunk/source/graphics/GameView.h

@@ -28 +28 @@
 class CCamera;
 class CCinemaManager;
-class CLOSTexture;
 class CVector3D;
 struct SViewPort;
@@ -52 +51 @@
     virtual void EnumerateObjects(const CFrustum& frustum, SceneCollector* c);
     virtual CLOSTexture& GetLOSTexture();
+    virtual CTerritoryTexture& GetTerritoryTexture();
     //END: Implementation of Scene
 

ps/trunk/source/graphics/LOSTexture.cpp

@@ -24 +24 @@
 #include "ps/Game.h"
 #include "ps/Profile.h"
-#include "ps/World.h"
 #include "renderer/Renderer.h"
 #include "simulation2/Simulation2.h"

ps/trunk/source/gui/MiniMap.cpp

@@ -28 +28 @@
 #include "graphics/TerrainTextureEntry.h"
 #include "graphics/TerrainTextureManager.h"
+#include "graphics/TerritoryTexture.h"
 #include "lib/ogl.h"
 #include "lib/external_libraries/sdl.h"
@@ -40 +41 @@
 #include "simulation2/Simulation2.h"
 #include "simulation2/components/ICmpMinimap.h"
+#include "simulation2/components/ICmpTerritoryManager.h"
 
 bool g_GameRestarted = false;
@@ -311 +313 @@
     DrawTexture(texCoordMax, angle, x, y, x2, y2, z);
 
-    /* // TODO: reimplement with new sim system
-    // Shade territories by player
-    CTerritoryManager* territoryMgr = g_Game->GetWorld()->GetTerritoryManager();
-    std::vector<CTerritory*>& territories = territoryMgr->GetTerritories();
-
-    PROFILE_START("minimap territory shade");
-    
-    glDisable(GL_TEXTURE_2D);
+
+    // Draw territory boundaries
+    CTerritoryTexture& territoryTexture = g_Game->GetView()->GetTerritoryTexture();
+    territoryTexture.BindTexture(0);
     glEnable(GL_BLEND);
-    glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-    for( size_t i=0; i<territories.size(); i++ )
-    {
-        if( territories[i]->owner->GetPlayerID() == 0 )
-            continue;
-        std::vector<CVector2D>& boundary = territories[i]->boundary;
-        SPlayerColour col = territories[i]->owner->GetColour();
-        glColor4f(col.r, col.g, col.b, 0.25f);
-        glBegin(GL_POLYGON);
-        for( size_t j=0; j<boundary.size(); j++ )
-        {
-            float fx = boundary[j].x / (m_Terrain->GetTilesPerSide() * CELL_SIZE);
-            float fy = boundary[j].y / (m_Terrain->GetTilesPerSide() * CELL_SIZE);
-            glVertex3f( x*(1-fx) + x2*fx, y*(1-fy) + y2*fy, z );
-        }
-        glEnd();
-    }
+    glMatrixMode(GL_TEXTURE);
+    glLoadMatrixf(territoryTexture.GetMinimapTextureMatrix());
+    glMatrixMode(GL_MODELVIEW);
+
+    DrawTexture(1.0f, angle, x, y, x2, y2, z);
+
+    glMatrixMode(GL_TEXTURE);
+    glLoadIdentity();
+    glMatrixMode(GL_MODELVIEW);
     glDisable(GL_BLEND);
 
-    PROFILE_END("minimap territory shade");
-
-    // Draw territory boundaries
-    glEnable(GL_LINE_SMOOTH);
-    glLineWidth(1.0f);
-    glEnable(GL_BLEND);
-    glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-    glColor4f(0.8f, 0.8f, 0.8f, 0.8f);
-    for( size_t i=0; i<territories.size(); i++ )
-    {
-        std::vector<CVector2D>& boundary = territories[i]->boundary;
-        glBegin(GL_LINE_LOOP);
-        for( size_t j=0; j<boundary.size(); j++ )
-        {
-            float fx = boundary[j].x / (m_Terrain->GetTilesPerSide() * CELL_SIZE);
-            float fy = boundary[j].y / (m_Terrain->GetTilesPerSide() * CELL_SIZE);
-            glVertex3f( x*(1-fx) + x2*fx, y*(1-fy) + y2*fy, z );
-        }
-        glEnd();
-    }
-    glLineWidth(1.0f);
-    glDisable(GL_LINE_SMOOTH);
-    glDisable(GL_BLEND);
-    */
 
     // Draw the LOS quad in black, using alpha values from the LOS texture

ps/trunk/source/renderer/Scene.h

@@ -36 +36 @@
 class CPatch;
 class CLOSTexture;
+class CTerritoryTexture;
 struct SOverlayLine;
 struct SOverlaySprite;
@@ -64 +65 @@
      */
     virtual CLOSTexture& GetLOSTexture() = 0;
+
+    /**
+     * Return the territory texture to be used for rendering this scene.
+     */
+    virtual CTerritoryTexture& GetTerritoryTexture() = 0;
 };
 

ps/trunk/source/renderer/TerrainRenderer.cpp

@@ -32 +32 @@
 #include "graphics/Model.h"
 #include "graphics/ShaderManager.h"
+#include "graphics/TerritoryTexture.h"
 
 #include "maths/MathUtil.h"
@@ -401 +402 @@
     shader->BindTexture("losTex", los.GetTexture());
     shader->Uniform("losTransform", los.GetTextureMatrix()[0], los.GetTextureMatrix()[12], 0.f, 0.f);
+
+    CTerritoryTexture& territory = g_Renderer.GetScene().GetTerritoryTexture();
+    shader->BindTexture("territoryTex", territory.GetTexture());
+    shader->Uniform("territoryTransform", territory.GetTextureMatrix()[0], territory.GetTextureMatrix()[12], 0.f, 0.f);
 
     shader->Uniform("ambient", lightEnv.m_TerrainAmbientColor);

ps/trunk/source/simulation2/Simulation2.cpp

@@ -85 +85 @@
         m_ComponentManager.AddComponent(SYSTEM_ENTITY, CID_SoundManager, noParam);
         m_ComponentManager.AddComponent(SYSTEM_ENTITY, CID_Terrain, noParam);
+        m_ComponentManager.AddComponent(SYSTEM_ENTITY, CID_TerritoryManager, noParam);
         m_ComponentManager.AddComponent(SYSTEM_ENTITY, CID_WaterManager, noParam);
 

ps/trunk/source/simulation2/TypeList.h

@@ -1 @@
-/* Copyright (C) 2010 Wildfire Games.
+/* Copyright (C) 2011 Wildfire Games.
  * This file is part of 0 A.D.
  *
@@ -120 +120 @@
 COMPONENT(Selectable)
 
+INTERFACE(Settlement)
+COMPONENT(SettlementScripted)
+
 INTERFACE(SoundManager)
 COMPONENT(SoundManager)
@@ -125 +128 @@
 INTERFACE(Terrain)
 COMPONENT(Terrain)
+
+INTERFACE(TerritoryInfluence)
+COMPONENT(TerritoryInfluence)
+
+INTERFACE(TerritoryManager)
+COMPONENT(TerritoryManager)
 
 INTERFACE(UnitMotion)

ps/trunk/source/simulation2/components/ICmpObstruction.h

@@ -33 +33 @@
     virtual ICmpObstructionManager::tag_t GetObstruction() = 0;
 
+    /**
+     * Gets the square corresponding to this obstruction shape.
+     * @return true and updates @p out on success;
+     *         false on failure (e.g. object not in the world).
+     */
     virtual bool GetObstructionSquare(ICmpObstructionManager::ObstructionSquare& out) = 0;
 

ps/trunk/source/tools/atlas/GameInterface/ActorViewer.cpp

@@ -32 +32 @@
 #include "graphics/TerrainTextureEntry.h"
 #include "graphics/TerrainTextureManager.h"
+#include "graphics/TerritoryTexture.h"
 #include "graphics/UnitManager.h"
 #include "maths/MathUtil.h"
@@ -61 +62 @@
         Simulation2(&UnitManager, &Terrain),
         ObjectManager(MeshManager, SkeletonAnimManager, Simulation2),
-        LOSTexture(Simulation2)
+        LOSTexture(Simulation2),
+        TerritoryTexture(Simulation2)
     {
         UnitManager.SetObjectManager(ObjectManager);
@@ -85 +87 @@
     CSimulation2 Simulation2;
     CLOSTexture LOSTexture;
+    CTerritoryTexture TerritoryTexture;
 
     // Simplistic implementation of the Scene interface
@@ -104 +107 @@
     }
 
+    virtual CTerritoryTexture& GetTerritoryTexture()
+    {
+        return TerritoryTexture;
+    }
 };