entity ray selection

source/game/BaseAnimating.cpp

@@ -309,6 +309,11 @@ void CBaseAnimating::setPos(const float3 & pos)
 	if(m_pRigidBody)
 	{
 		m_pRigidBody->getWorldTransform().setOrigin(F3_BTVEC(pos));
+
+		if(m_pMgr->isEditorMode())
+		{
+			SPhysics_GetDynWorld()->updateSingleAabb(m_pRigidBody);
+		}
 	}
 }
 
@@ -318,6 +323,11 @@ void CBaseAnimating::setOrient(const SMQuaternion & q)
 	if(m_pRigidBody)
 	{
 		m_pRigidBody->getWorldTransform().setRotation(Q4_BTQUAT(q));
+
+		if(m_pMgr->isEditorMode())
+		{
+			SPhysics_GetDynWorld()->updateSingleAabb(m_pRigidBody);
+		}
 	}
 }
 
@@ -487,3 +497,12 @@ void CBaseAnimating::setSkin(int iSkin)
 	m_iSkin = iSkin;
 }
 
+void CBaseAnimating::_initEditorBoxes()
+{
+	// do nothing
+}
+
+void CBaseAnimating::_releaseEditorBoxes()
+{
+	// do nothing
+}

source/game/BaseAnimating.h

@@ -59,6 +59,8 @@ public:
 	COLLISION_GROUP getCollisionGroup();
 
 protected:
+	virtual void _initEditorBoxes();
+	virtual void _releaseEditorBoxes();
 
 	void inputPlayAnim(inputdata_t * pInputdata);
 	void inputPlayAnimNext(inputdata_t * pInputdata);

source/game/BaseEntity.cpp

@@ -92,6 +92,8 @@ CBaseEntity::CBaseEntity(CEntityManager * pWorld):
 
 CBaseEntity::~CBaseEntity()
 {
+	_releaseEditorBoxes();
+
 	m_pMgr->unreg(m_iId);
 
 	proptable_t * pt = getPropTable();
@@ -149,6 +151,12 @@ void CBaseEntity::getSphere(float3 * center, float * radius)
 void CBaseEntity::setPos(const float3 & pos)
 {
 	m_vPosition = pos;
+
+	if(m_pEditorRigidBody)
+	{
+		m_pEditorRigidBody->getWorldTransform().setOrigin(F3_BTVEC(m_vPosition));
+		SPhysics_GetDynWorld()->updateSingleAabb(m_pEditorRigidBody);
+	}
 }
 
 float3 CBaseEntity::getPos()
@@ -860,3 +868,42 @@ void CBaseEntity::_cleanup()
 void CBaseEntity::onUse(CBaseEntity *pUser)
 {
 }
+
+void CBaseEntity::_initEditorBoxes()
+{
+	if(m_pEditorRigidBody)
+	{
+		return;
+	}
+
+	float3 vBoxHalfSize = m_vEditorBoxSize * 0.5f;
+	m_pEditorCollideShape = new btBoxShape(F3_BTVEC(vBoxHalfSize));
+
+	btDefaultMotionState * motionState = new btDefaultMotionState(btTransform(Q4_BTQUAT(SMQuaternion()), F3_BTVEC(m_vPosition)));
+	btRigidBody::btRigidBodyConstructionInfo rigidBodyCI(
+		0,                  // mass
+		motionState,        // initial position
+		m_pEditorCollideShape,    // collision shape of body
+		btVector3(0,0,0)  // local inertia
+		);
+	m_pEditorRigidBody = new btRigidBody(rigidBodyCI);
+	m_pEditorRigidBody->getInvMass();
+	m_pEditorRigidBody->setUserPointer(this);
+
+	SPhysics_AddShapeEx(m_pEditorRigidBody, CG_DEFAULT, CG_BULLETFIRE);
+}
+
+void CBaseEntity::_releaseEditorBoxes()
+{
+	if(m_pEditorRigidBody)
+	{
+		SPhysics_RemoveShape(m_pEditorRigidBody);
+	}
+	mem_delete(m_pEditorRigidBody);
+	mem_delete(m_pEditorCollideShape);
+}
+
+float3 CBaseEntity::getEditorBoxSize()
+{
+	return(m_vEditorBoxSize);
+}

source/game/BaseEntity.h

@@ -134,6 +134,9 @@ public:
 	//! Обновляет действие флагов в режиме редактора уровня
 	virtual void updateFlags(){}
 
+
+	virtual float3 getEditorBoxSize();
+
 private:
 	void setClassName(const char * name);
 	void setDefaults();
@@ -145,6 +148,8 @@ private:
 
 protected:
 	virtual void _cleanup();
+	virtual void _initEditorBoxes();
+	virtual void _releaseEditorBoxes();
 
 	CEntityManager * m_pMgr;
 
@@ -209,6 +214,14 @@ protected:
 	void takeHealth(float fVal, CBaseEntity *pAttacker, CBaseEntity *pInflictor=NULL);
 
 	bool m_bSynced;
+
+
+	//! Для редактора
+	//@{
+	float3_t m_vEditorBoxSize = float3_t(0.16f, 0.16f, 0.16f);
+	btCollisionShape * m_pEditorCollideShape = NULL;
+	btRigidBody * m_pEditorRigidBody = NULL;
+	//@}
 };
 
 #pragma warning(pop)

source/game/EntityFactory.cpp

@@ -55,6 +55,10 @@ CBaseEntity * CEntityFactoryMap::create(const char * szName, CEntityManager * pW
 		{
 			pEnt->onPostLoad();
 		}
+		if(pWorld->isEditorMode())
+		{
+			pEnt->_initEditorBoxes();
+		}
 		return(pEnt);
 	}
 	return(NULL);

source/game/EntityManager.cpp

@@ -807,4 +807,40 @@ void CEntityManager::sheduleDestroy(CBaseEntity *pEnt)
 {
 	pEnt->setFlags(pEnt->getFlags() | EF_REMOVED);
 	m_vEntRemoveList.push_back(pEnt);
+
+	if(m_isEditorMode)
+	{
+		pEnt->_releaseEditorBoxes();
+	}
+}
+
+void CEntityManager::setEditorMode(bool isEditor)
+{
+	if(m_isEditorMode == isEditor)
+	{
+		return;
+	}
+	m_isEditorMode = isEditor;
+
+	for(int i = 0, l = m_vEntList.size(); i < l; ++i)
+	{
+		CBaseEntity * pEnt = m_vEntList[i];
+		if(!pEnt)
+		{
+			continue;
+		}
+		if(isEditor)
+		{
+			pEnt->_initEditorBoxes();
+		}
+		else
+		{
+			pEnt->_releaseEditorBoxes();
+		}
+	}
+}
+
+bool CEntityManager::isEditorMode()
+{
+	return(m_isEditorMode);
 }

source/game/EntityManager.h

@@ -108,6 +108,9 @@ public:
 
 	void sheduleDestroy(CBaseEntity *pEnt);
 
+	void setEditorMode(bool isEditor = true);
+	bool isEditorMode();
+
 protected:
 	ID reg(CBaseEntity * pEnt);
 	void unreg(ID ent);
@@ -127,6 +130,8 @@ protected:
 	//! @warning это нужно хранить в течение работы проги, т.к. таблицы дефолтов ссылаются напрямую на этот объект
 	ISXConfig * m_pDefaultsConf;
 	ISXConfig * m_pDynClassConf;
+
+	bool m_isEditorMode = false;
 };
 
 #endif

source/game/GameData.cpp

@@ -752,6 +752,10 @@ GameData::GameData(HWND hWnd, bool isGame):
 
 		m_pPlayer->setActiveTool(pTool);
 	}
+	else
+	{
+		m_pMgr->setEditorMode(true);
+	}
 }
 GameData::~GameData()
 {

source/game/sxgame.h

@@ -266,6 +266,9 @@ SX_LIB_API void SGame_SetDebugText(const char *szText);
 */
 SX_LIB_API ID SGame_EntClone(ID idSrc);
 
+/*! Находит объект по пересечению с лучем, в режиме редактора так же находит точечные объекты, в режиме игры - нет
+*/
+SX_LIB_API ID SGame_EntGetByRay(const float3 &vStart, const float3 &vDir, float3 *pHitPos = NULL);
 
 #endif
 

source/game/sxgame_dll.cpp

@@ -10,6 +10,7 @@ See the license in LICENSE
 #include "sxgame.h"
 #include <core/sxcore.h>
 #include <gcore/sxgcore.h>
+#include <BulletCollision/NarrowPhaseCollision/btRaycastCallback.h>
 
 #include "EntityManager.h"
 
@@ -200,8 +201,8 @@ SX_LIB_API void SGame_EditorRender(ID id, ID id_sel_tex, const float3 *pvRenderP
 {
 	SG_PRECOND(_VOID);
 
-	CBaseEntity* bEnt = SGame_EntGet(id);
-	if (!bEnt)
+	CBaseEntity* pEnt = SGame_EntGet(id);
+	if (!pEnt)
 		return;
 
 	SMMATRIX mView, mProj;
@@ -211,9 +212,11 @@ SX_LIB_API void SGame_EditorRender(ID id, ID id_sel_tex, const float3 *pvRenderP
 	SGCore_GetDXDevice()->SetTransform(D3DTS_VIEW, (D3DMATRIX*)&mView);
 	SGCore_GetDXDevice()->SetTransform(D3DTS_PROJECTION, (D3DMATRIX*)&mProj);
 
-	if(strcmp(bEnt->getClassName(), "path_corner") == 0)
+	float3 vBoxSize = pEnt->getEditorBoxSize();
+
+	if(strcmp(pEnt->getClassName(), "path_corner") == 0)
 	{
-		CPathCorner * pStartPoint = (CPathCorner*)bEnt;
+		CPathCorner * pStartPoint = (CPathCorner*)pEnt;
 		if (!pStartPoint)
 			return;
 
@@ -230,7 +233,7 @@ SX_LIB_API void SGame_EditorRender(ID id, ID id_sel_tex, const float3 *pvRenderP
 		{
 			len += pCur->GetLength();
 			++count;
-			SGCore_GetDXDevice()->SetTransform(D3DTS_WORLD, (D3DMATRIX*)&SMMatrixTranslation(pCur->getPos()));
+			SGCore_GetDXDevice()->SetTransform(D3DTS_WORLD, (D3DMATRIX*)&SMMatrixTranslation(SMMatrixScaling(vBoxSize) * pCur->getPos()));
 
 			if (id == pCur->getId())
 				SGCore_GetDXDevice()->SetTexture(0, SGCore_LoadTexGetTex(id_sel_tex));
@@ -279,7 +282,7 @@ SX_LIB_API void SGame_EditorRender(ID id, ID id_sel_tex, const float3 *pvRenderP
 
 		SGCore_GetDXDevice()->SetTransform(D3DTS_VIEW, (D3DMATRIX*)&mView);
 		SGCore_GetDXDevice()->SetTransform(D3DTS_PROJECTION, (D3DMATRIX*)&mProj);
-		SGCore_GetDXDevice()->SetTransform(D3DTS_WORLD, (D3DMATRIX*)&(bEnt->getOrient().GetMatrix() * SMMatrixTranslation(pvRenderPos ? *pvRenderPos : bEnt->getPos()))/*bEnt->getWorldTM()*/);
+		SGCore_GetDXDevice()->SetTransform(D3DTS_WORLD, (D3DMATRIX*)&(SMMatrixScaling(vBoxSize) * pEnt->getOrient().GetMatrix() * SMMatrixTranslation(pvRenderPos ? *pvRenderPos : pEnt->getPos()))/*bEnt->getWorldTM()*/);
 
 		SGCore_GetDXDevice()->SetTexture(0, SGCore_LoadTexGetTex(id_sel_tex));
 		g_pFigureBox->DrawSubset(0);
@@ -408,7 +411,7 @@ SX_LIB_API void SGame_SetDebugText(const char *szText)
 
 SX_LIB_API ID SGame_EntClone(ID idSrc)
 {
-	SG_PRECOND(NULL);
+	SG_PRECOND(-1);
 	CBaseEntity *pEnt = GameData::m_pMgr->cloneEntity(GameData::m_pMgr->getById(idSrc));
 
 	if(!pEnt)
@@ -418,3 +421,28 @@ SX_LIB_API ID SGame_EntClone(ID idSrc)
 
 	return(pEnt->getId());
 }
+
+SX_LIB_API ID SGame_EntGetByRay(const float3 &vStart, const float3 &vDir, float3 *pHitPos)
+{
+	SG_PRECOND(-1);
+	float3 vEnd = vStart + vDir * 10000.0f;
+	btCollisionWorld::ClosestRayResultCallback cb(F3_BTVEC(vStart), F3_BTVEC(vEnd));
+	cb.m_collisionFilterGroup = CG_BULLETFIRE;
+	cb.m_collisionFilterMask = CG_ALL;
+	cb.m_flags |= btTriangleRaycastCallback::kF_FilterBackfaces;
+	SPhysics_GetDynWorld()->rayTest(F3_BTVEC(vStart), F3_BTVEC(vEnd), cb);
+
+	if(cb.hasHit())
+	{
+		CBaseEntity *pEnt = (CBaseEntity*)cb.m_collisionObject->getUserPointer();
+		if(pEnt)
+		{
+			if(pHitPos)
+			{
+				*pHitPos = BTVEC_F3(cb.m_hitPointWorld);
+			}
+			return(pEnt->getId());
+		}
+	}
+	return(-1);
+}

source/sxleveleditor/common_callback.cpp

@@ -257,7 +257,7 @@ LRESULT SXLevelEditor_RenderWindow_LClick(HWND hWnd, UINT uiMsg, WPARAM wParam,
 			level_editor::GreenTraceSelect();
 		else if (level_editor::iActiveGroupType == EDITORS_LEVEL_GROUPTYPE_GAME && level_editor::idActiveElement >= 0)
 		{
-
+			level_editor::GameTraceSelect();
 		}
 		else if (level_editor::iActiveGroupType == EDITORS_LEVEL_GROUPTYPE_AIGRID)
 			level_editor::AIGridTraceSelect();

source/sxleveleditor/game_callback.cpp

@@ -249,6 +249,29 @@ void level_editor::GameSel(int iSelected)
 	//level_editor::pAxesHelper->setScale(float3(1, 1, 1));
 }
 
+void level_editor::GameTraceSelect()
+{
+	float3 vResult;
+	ID idEnt = -1;
+	ID idMtrl = -1;
+
+	idEnt = SGame_EntGetByRay(vRayOrigin, vRayDir, &vResult);
+
+	if(ID_VALID(idEnt))
+	{
+		for(int i = 0, l = pListBoxList->getItemCount(); i < l; ++i)
+		{
+			if(pListBoxList->getItemData(i) == idEnt)
+			{
+				pListBoxList->setSel(i);
+				GameSel(i);
+				idMtl = idMtrl;
+				return;
+			}
+		}
+	}
+}
+
 void level_editor::GameTraceSetPos()
 {
 	if (level_editor::iActiveGroupType != EDITORS_LEVEL_GROUPTYPE_GAME || level_editor::idActiveElement < 0)

source/sxleveleditor/level_editor.h

@@ -372,6 +372,8 @@ namespace level_editor
 	//!        listbox
 	void GameSel(int iSelect);
 
+	void GameTraceSelect();
+
 	//!        
 	void GameTraceSetPos();