Carltonus/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

# Display units on the minimap

Browse Source 
This was SVN commit r7480.
This commit is contained in:
Ykkrosh 2010-04-23 18:36:48 +00:00
parent 29b458da40
commit f4ad5906c9
10 changed files with 328 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
binaries/data/mods/public/simulation/components/Player.js
View File

@ -18,6 +18,15 @@ Player.prototype.Init = function()
};
};
Player.prototype.GetColour = function()
{
// TODO: need proper colour support
if (this.playerID == 1)
return { "r": 0.0, "g": 0.0, "b": 1.0, "a": 1.0 };
else
return { "r": 1.0, "g": 0.0, "b": 0.0, "a": 1.0 };
};
Player.prototype.SetPlayerID = function(id)
{
this.playerID = id;

96
source/gui/MiniMap.cpp
View File

@ -45,7 +45,8 @@
#include "simulation/EntityTemplate.h"
#include "simulation/LOSManager.h"
#include "simulation/TerritoryManager.h"
#include "simulation2/Simulation2.h"
#include "simulation2/components/ICmpMinimap.h"
bool g_TerrainModified = false;
bool g_GameRestarted = false;
@ -397,13 +398,6 @@ void CMiniMap::Draw()
PROFILE_START("minimap units");
// Draw unit points
const std::vector<CUnit *> &units = m_UnitManager->GetUnits();
std::vector<CUnit *>::const_iterator iter = units.begin();
CUnit *unit = 0;
CVector2D pos;
CLOSManager* losMgr = g_Game->GetWorld()->GetLOSManager();
std::vector<MinimapUnitVertex> vertexArray;
// TODO: don't reallocate this after every frame (but don't waste memory
// after the number of units decreases substantially)
@ -412,41 +406,71 @@ void CMiniMap::Draw()
// (~70msec/frame on a GF4 rendering a thousand points)
glPointSize(3.f);
for(; iter != units.end(); ++iter)
if (g_UseSimulation2)
{
unit = (CUnit *)(*iter);
if(unit && unit->GetEntity() && losMgr->GetUnitStatus(unit, g_Game->GetLocalPlayer()) != UNIT_HIDDEN)
float sx = m_scaleX / CELL_SIZE;
float sy = m_scaleY / CELL_SIZE;
CSimulation2* sim = g_Game->GetSimulation2();
const CSimulation2::InterfaceList& ents = sim->GetEntitiesWithInterface(IID_Minimap);
for (CSimulation2::InterfaceList::const_iterator it = ents.begin(); it != ents.end(); ++it)
{
CEntity* entity = unit->GetEntity();
CStrW& type = entity->m_base->m_minimapType;
MinimapUnitVertex v;
if(type==L"Unit" || type==L"Structure" || type==L"Hero") {
// Use the player colour
const SPlayerColour& colour = entity->GetPlayer()->GetColour();
v.r = cpu_i32FromFloat(colour.r*255.f);
v.g = cpu_i32FromFloat(colour.g*255.f);
v.b = cpu_i32FromFloat(colour.b*255.f);
ICmpMinimap* cmpMinimap = static_cast<ICmpMinimap*>(it->second);
if (cmpMinimap->GetRenderData(v.r, v.g, v.b, v.x, v.y))
{
v.a = 255;
v.x = x + v.x*sx;
v.y = y - v.y*sy;
vertexArray.push_back(v);
}
else {
CEntityTemplate* base = entity->m_base;
v.r = base->m_minimapR;
v.g = base->m_minimapG;
v.b = base->m_minimapB;
v.a = 255;
}
pos = GetMapSpaceCoords(entity->m_position);
v.x = x + pos.x;
v.y = y - pos.y;
vertexArray.push_back(v);
}
}
}
else
{
// Draw unit points
const std::vector<CUnit *> &units = m_UnitManager->GetUnits();
std::vector<CUnit *>::const_iterator iter = units.begin();
CUnit *unit = 0;
CVector2D pos;
CLOSManager* losMgr = g_Game->GetWorld()->GetLOSManager();
if (vertexArray.size())
for(; iter != units.end(); ++iter)
{
unit = (CUnit *)(*iter);
if(unit && unit->GetEntity() && losMgr->GetUnitStatus(unit, g_Game->GetLocalPlayer()) != UNIT_HIDDEN)
{
CEntity* entity = unit->GetEntity();
CStrW& type = entity->m_base->m_minimapType;
MinimapUnitVertex v;
if(type==L"Unit" || type==L"Structure" || type==L"Hero") {
// Use the player colour
const SPlayerColour& colour = entity->GetPlayer()->GetColour();
v.r = cpu_i32FromFloat(colour.r*255.f);
v.g = cpu_i32FromFloat(colour.g*255.f);
v.b = cpu_i32FromFloat(colour.b*255.f);
v.a = 255;
}
else {
CEntityTemplate* base = entity->m_base;
v.r = base->m_minimapR;
v.g = base->m_minimapG;
v.b = base->m_minimapB;
v.a = 255;
}
pos = GetMapSpaceCoords(entity->m_position);
v.x = x + pos.x;
v.y = y - pos.y;
vertexArray.push_back(v);
}
}
}
if (!vertexArray.empty())
{
glPushMatrix();
glTranslatef(0, 0, z);

3
source/simulation2/TypeList.h
View File

@ -59,6 +59,9 @@ COMPONENT(Footprint)
INTERFACE(GuiInterface)
COMPONENT(GuiInterfaceScripted)
INTERFACE(Minimap)
COMPONENT(Minimap)
INTERFACE(Motion)
COMPONENT(MotionBall)
COMPONENT(MotionScripted)

173
source/simulation2/components/CCmpMinimap.cpp Normal file
View File

@ -0,0 +1,173 @@
/* Copyright (C) 2010 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 "simulation2/system/Component.h"
#include "ICmpMinimap.h"
#include "simulation2/components/ICmpPlayerManager.h"
#include "simulation2/components/ICmpPlayer.h"
#include "simulation2/MessageTypes.h"
#include "ps/Overlay.h"
class CCmpMinimap : public ICmpMinimap
{
public:
static void ClassInit(CComponentManager& componentManager)
{
componentManager.SubscribeToMessageType(MT_PositionChanged);
componentManager.SubscribeToMessageType(MT_OwnershipChanged);
}
DEFAULT_COMPONENT_ALLOCATOR(Minimap)
bool m_Active;
bool m_UsePlayerColour;
u8 m_R, m_G, m_B;
entity_pos_t m_X, m_Z; // cache the latest position for more efficient rendering
static std::string GetSchema()
{
return
"<element name='Type'>"
"<choice>"
"<value>food</value>"
"<value>wood</value>"
"<value>stone</value>"
"<value>metal</value>"
"<value>structure</value>"
"<value>settlement</value>"
"<value>unit</value>"
"<value>support</value>"
"<value>hero</value>"
"</choice>"
"</element>"
"<optional>"
"<element name='Colour'>"
"<attribute name='r'>"
"<data type='integer'><param name='minInclusive'>0</param><param name='maxInclusive'>255</param></data>"
"</attribute>"
"<attribute name='g'>"
"<data type='integer'><param name='minInclusive'>0</param><param name='maxInclusive'>255</param></data>"
"</attribute>"
"<attribute name='b'>"
"<data type='integer'><param name='minInclusive'>0</param><param name='maxInclusive'>255</param></data>"
"</attribute>"
"</element>"
"</optional>";
}
virtual void Init(const CSimContext& context, const CParamNode& paramNode)
{
m_Active = true;
const CParamNode& colour = paramNode.GetChild("Colour");
if (colour.IsOk())
{
m_UsePlayerColour = false;
m_R = colour.GetChild("@r").ToInt();
m_G = colour.GetChild("@g").ToInt();
m_B = colour.GetChild("@b").ToInt();
}
else
{
m_UsePlayerColour = true;
// Choose a bogus colour which will get replaced once we have an owner
m_R = 255;
m_G = 0;
m_B = 255;
}
}
virtual void Deinit(const CSimContext& UNUSED(context))
{
}
virtual void Serialize(ISerializer& serialize)
{
// TODO
}
virtual void Deserialize(const CSimContext& context, const CParamNode& paramNode, IDeserializer& deserialize)
{
Init(context, paramNode);
// TODO
}
virtual void HandleMessage(const CSimContext& context, const CMessage& msg, bool UNUSED(global))
{
switch (msg.GetType())
{
case MT_PositionChanged:
{
const CMessagePositionChanged& data = static_cast<const CMessagePositionChanged&> (msg);
if (data.inWorld)
{
m_Active = true;
m_X = data.x;
m_Z = data.z;
}
else
{
m_Active = false;
}
break;
}
case MT_OwnershipChanged:
{
if (!m_UsePlayerColour)
break;
const CMessageOwnershipChanged& msgData = static_cast<const CMessageOwnershipChanged&> (msg);
// Find the new player's colour
CmpPtr<ICmpPlayerManager> cmpPlayerManager(context, SYSTEM_ENTITY);
if (cmpPlayerManager.null())
break;
CmpPtr<ICmpPlayer> cmpPlayer(context, cmpPlayerManager->GetPlayerByID(msgData.to));
if (cmpPlayer.null())
break;
CColor colour = cmpPlayer->GetColour();
m_R = (int)(colour.r*255.0);
m_G = (int)(colour.g*255.0);
m_B = (int)(colour.b*255.0);
break;
}
}
}
virtual bool GetRenderData(u8& r, u8& g, u8& b, float& x, float& z)
{
if (!m_Active)
return false;
r = m_R;
g = m_G;
b = m_B;
x = m_X.ToFloat();
z = m_Z.ToFloat();
return true;
}
};
REGISTER_COMPONENT_TYPE(Minimap)

25
source/simulation2/components/ICmpMinimap.cpp Normal file
View File

@ -0,0 +1,25 @@
/* Copyright (C) 2010 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 "ICmpMinimap.h"
#include "simulation2/system/InterfaceScripted.h"
BEGIN_INTERFACE_WRAPPER(Minimap)
END_INTERFACE_WRAPPER(Minimap)

39
source/simulation2/components/ICmpMinimap.h Normal file
View File

@ -0,0 +1,39 @@
/* Copyright (C) 2010 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_ICMPMINIMAP
#define INCLUDED_ICMPMINIMAP
#include "simulation2/system/Interface.h"
/**
* Per-unit minimap data.
*/
class ICmpMinimap : public IComponent
{
public:
/**
* Get the data for rendering this entity on the minimap.
* If it should not be drawn, returns false; otherwise the arguments are set
* to the colour and world position.
*/
virtual bool GetRenderData(u8& r, u8& g, u8& b, float& x, float& z) = 0;
DECLARE_INTERFACE_TYPE(Minimap)
};
#endif // INCLUDED_ICMPMINIMAP

7
source/simulation2/components/ICmpPlayer.cpp
View File

@ -22,6 +22,8 @@
#include "simulation2/system/InterfaceScripted.h"
#include "simulation2/scripting/ScriptComponent.h"
#include "ps/Overlay.h"
BEGIN_INTERFACE_WRAPPER(Player)
END_INTERFACE_WRAPPER(Player)
@ -34,6 +36,11 @@ public:
{
m_Script.CallVoid("SetName", name);
}
virtual CColor GetColour()
{
return m_Script.Call<CColor>("GetColour");
}
};
REGISTER_COMPONENT_SCRIPT_WRAPPER(PlayerScripted)

8
source/simulation2/components/ICmpPlayer.h
View File

@ -20,10 +20,12 @@
#include "simulation2/system/Interface.h"
struct CColor;
/**
* Player data.
* (This interface only includes the functions needed by native code for loading maps;
* most player interaction is handled by scripts instead.)
* (This interface only includes the functions needed by native code for loading maps,
* and for minimap rendering; most player interaction is handled by scripts instead.)
*/
class ICmpPlayer : public IComponent
{
@ -31,6 +33,8 @@ public:
virtual void SetName(const std::wstring& name) = 0;
// TODO: some more data
virtual CColor GetColour() = 0;
DECLARE_INTERFACE_TYPE(Player)
};

5
source/simulation2/components/ICmpPlayerManager.cpp
View File

@ -34,6 +34,11 @@ public:
{
m_Script.CallVoid("AddPlayer", (int)ent);
}
virtual entity_id_t GetPlayerByID(int32_t id)
{
return m_Script.Call<entity_id_t>("GetPlayerByID", (int)id);
}
};
REGISTER_COMPONENT_SCRIPT_WRAPPER(PlayerManagerScripted)

2
source/simulation2/components/ICmpPlayerManager.h
View File

@ -28,7 +28,7 @@ class ICmpPlayerManager : public IComponent
public:
virtual void AddPlayer(entity_id_t ent) = 0;
// Accessors are currently only available to scripts, since no C++ code needed them yet
virtual entity_id_t GetPlayerByID(int32_t id) = 0;
DECLARE_INTERFACE_TYPE(PlayerManager)
};