Differential D2936 Diff 13102 source/simulation2/components/CCmpUnitRenderer.cpp

Changeset View

Standalone View

source/simulation2/components/CCmpUnitRenderer.cpp

Show All 31 Lines
#include "graphics/ModelAbstract.h"		#include "graphics/ModelAbstract.h"
#include "graphics/ObjectEntry.h"		#include "graphics/ObjectEntry.h"
#include "graphics/Overlay.h"		#include "graphics/Overlay.h"
#include "graphics/Unit.h"		#include "graphics/Unit.h"
#include "maths/BoundingSphere.h"		#include "maths/BoundingSphere.h"
#include "maths/Matrix3D.h"		#include "maths/Matrix3D.h"
#include "ps/GameSetup/Config.h"		#include "ps/GameSetup/Config.h"
#include "ps/Profile.h"		#include "ps/Profile.h"
		#include "ps/Game.h"
		vladislavbelovUnsubmitted Done Inline Actions Wrong order. vladislavbelov: Wrong order.
#include "renderer/RenderingOptions.h"		#include "renderer/RenderingOptions.h"
#include "renderer/Scene.h"		#include "renderer/Scene.h"

		#include <algorithm>
		#include <deque>

#include "tools/atlas/GameInterface/GameLoop.h"		#include "tools/atlas/GameInterface/GameLoop.h"

/**		/**
* Efficiently(ish) renders all the units in the world.		* Efficiently(ish) renders all the units in the world.
*		*
* The class maintains a list of all units that currently exist, and the data		* The class maintains a list of all units that currently exist, and the data
* needed for frustum-culling them. To minimise the amount of work done per		* needed for frustum-culling them. To minimise the amount of work done per
* frame (despite a unit's interpolated position changing every frame), the		* frame (despite a unit's interpolated position changing every frame), the
▲ Show 20 Lines • Show All 61 Lines • ▼ Show 20 Lines	struct SUnit
/**		/**
* For debug overlay.		* For debug overlay.
*/		*/
bool culled;		bool culled;
};		};

std::vector<SUnit> m_Units;		std::vector<SUnit> m_Units;
std::vector<tag_t> m_UnitTagsFree;		std::vector<tag_t> m_UnitTagsFree;
		/**
		* Contains the list of corpses currently displayed.
		*/
		std::deque<entity_id_t> m_Corpses;


int m_FrameNumber;		int m_FrameNumber;
float m_FrameOffset;		float m_FrameOffset;
		wraitiiUnsubmitted Done Inline Actions seems a bit weird to add it here between those two frame-related variables. I'd plop it above, with a little comment. wraitii: seems a bit weird to add it here between those two frame-related variables. I'd plop it above…

bool m_EnableDebugOverlays;		bool m_EnableDebugOverlays;
std::vector<SOverlaySphere> m_DebugSpheres;		std::vector<SOverlaySphere> m_DebugSpheres;

static void ClassInit(CComponentManager& componentManager)		static void ClassInit(CComponentManager& componentManager)
{		{
componentManager.SubscribeToMessageType(MT_TurnStart);		componentManager.SubscribeToMessageType(MT_TurnStart);
componentManager.SubscribeToMessageType(MT_Interpolate);		componentManager.SubscribeToMessageType(MT_Interpolate);
▲ Show 20 Lines • Show All 53 Lines • ▼ Show 20 Lines	public:

SUnit* LookupUnit(tag_t tag)		SUnit* LookupUnit(tag_t tag)
{		{
if (tag.n < 1 \|\| tag.n - 1 >= m_Units.size())		if (tag.n < 1 \|\| tag.n - 1 >= m_Units.size())
return NULL;		return NULL;
return &m_Units[tag.n - 1];		return &m_Units[tag.n - 1];
}		}

		virtual void AddCorpse(entity_id_t entity)
		{
		const int maxCorpses = g_RenderingOptions.GetMaxCorpseCount();
		wraitiiUnsubmitted Done Inline Actions Can't use size_t directly here? wraitii: Can't use size_t directly here?
		StanAuthorUnsubmitted Done Inline Actions Could but then I'd have to cast the 0 for fun :D Stan: Could but then I'd have to cast the 0 for fun :D
		if (maxCorpses <= 0)
		wraitiiUnsubmitted Not Done Inline Actions The fact that this works for both -1/unlimited and 0/deactivated is a bit weird wraitii: The fact that this works for both -1/unlimited and 0/deactivated is a bit weird
		return;

		if (m_Corpses.size() == static_cast<size_t>(maxCorpses))
		{
		const entity_id_t ent = m_Corpses.front();
		GetSimContext().GetComponentManager().DestroyComponentsSoon(ent);
		wraitiiUnsubmitted Not Done Inline Actions mention that it doesn't matter if ent is already destroyed maybe, since that's what makes this work. wraitii: mention that it doesn't matter if ent is already destroyed maybe, since that's what makes this…
		m_Corpses.pop_front();
		}

		m_Corpses.push_back(entity);
		}
		virtual void RemoveCorpse(entity_id_t entity)
		{
		int maxCorpses = g_RenderingOptions.GetMaxCorpseCount();
		if (maxCorpses <= 0)
		return;

		std::deque<entity_id_t>::iterator it = std::find(m_Corpses.begin(), m_Corpses.end(), entity);
		vladislavbelovUnsubmitted Not Done Inline Actions It does linear search, so in case of deleting many corpses per turn it might be expensive. vladislavbelov: It does linear search, so in case of deleting many corpses per turn it might be expensive.
		StanAuthorUnsubmitted Done Inline Actions What do you suggest then? Stan: What do you suggest then?
		wraitiiUnsubmitted Not Done Inline Actions This is partly the reason why I suggested keeping a small 'max' number. I think for < 500 it's going to be generally irrelevant. I might be wrong on that though - perhaps a number as low as 50 is good enough. If you keep the list sorted (precludes doing the pop-swap trick), you can use a binary search. wraitii: This is partly the reason why I suggested keeping a small 'max' number. I think for < 500 it's…
		wraitiiUnsubmitted Not Done Inline Actions BTW you'll have to do some o(N) thing somewhere -> either search can be amortised with binary search, but then you can pop-swap so erasing will be o(N/2), or you keep like this, and searching is o(N) but erasing o(1). It'd need to be tested to know which is faster and whether any of that is a real problem, which I doubt. wraitii: BTW you'll have to do some o(N) thing somewhere -> either search can be amortised with binary…
		if (it == m_Corpses.end())
		return;
		wraitiiUnsubmitted Not Done Inline Actions I think this is what Vladislav had performance concerns over, and it's legitimate to an extent. The thing is, I don't think you actually need this :p Just let the corpse deque hold invalid entities. wraitii: I think this is what Vladislav had performance concerns over, and it's legitimate to an extent.

		m_Corpses.erase(it);
		wraitiiUnsubmitted Done Inline Actions This reminds me -> You should swap and pop here instead. wraitii: This reminds me -> You should swap and pop here instead.
		SilierUnsubmitted Done Inline Actions I have feeling something went wrong here. You are looking for entity and if you find it, you do nothing with that information. Also L226 and L227 are doing nothing. Silier: I have feeling something went wrong here. You are looking for entity and if you find it, you do…
		SilierUnsubmitted Done Inline Actions ok, now i got it :D Silier: ok, now i got it :D
		}
		wraitiiUnsubmitted Done Inline Actions I don't think you need that -> you're calling RemoveCorpse in Deinit() which means the entity is already destroying itself. wraitii: I don't think you need that -> you're calling RemoveCorpse in Deinit() which means the entity…
		wraitiiUnsubmitted Done Inline Actions pop_ wraitii: pop_

		virtual bool CanAddCorpse()
		{
		return g_RenderingOptions.GetMaxCorpseCount() != 0;
		}

virtual tag_t AddUnit(CEntityHandle entity, CUnit* actor, const CBoundingSphere& boundsApprox, int flags)		virtual tag_t AddUnit(CEntityHandle entity, CUnit* actor, const CBoundingSphere& boundsApprox, int flags)
{		{
ENSURE(actor != NULL);		ENSURE(actor != NULL);

tag_t tag;		tag_t tag;
if (!m_UnitTagsFree.empty())		if (!m_UnitTagsFree.empty())
{		{
tag = m_UnitTagsFree.back();		tag = m_UnitTagsFree.back();
▲ Show 20 Lines • Show All 274 Lines • Show Last 20 Lines