NoEdge/Danbias
NoEdge
/
Danbias
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

GL - Hax to get the world model initiated. reading spawnpoints

This commit is contained in:
lindaandersson 2014-02-14 16:03:46 +01:00
parent 26fb7a5664
commit d32e614b00
2 changed files with 88 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
Code/Game/DanBiasGame/GameClientState/GameState.cpp
View File

@ -189,24 +189,59 @@ bool GameState::LoadModels(std::string mapFile)
break; break;
case GameLogic::ObjectType::ObjectType_Static: case GameLogic::ObjectType::ObjectType_Static:
{ {
GameLogic::ObjectHeader* staticObjData = ((GameLogic::ObjectHeader*)obj); GameLogic::ObjectHeader* staticObjData = ((GameLogic::ObjectHeader*)obj);
if((ObjectSpecialType)staticObjData->specialTypeID == ObjectSpecialType_Sky) if((ObjectSpecialType)staticObjData->specialTypeID == ObjectSpecialType_Sky)
{ {
int i = 0; modelData.modelPath.assign(staticObjData->ModelFile.begin(), staticObjData->ModelFile.end());
} modelData.visible = true;
modelData.modelPath.assign(staticObjData->ModelFile.begin(), staticObjData->ModelFile.end()); modelData.position = Oyster::Math::Float3(0,0,0);
modelData.visible = true; modelData.rotation = Oyster::Math::Quaternion::identity;
modelData.position = staticObjData->position; modelData.scale = Oyster::Math::Float3(600, 600, 600);
modelData.rotation = Oyster::Math::Quaternion(Oyster::Math::Float3(staticObjData->rotation), staticObjData->rotation[3]); modelData.id = modelId++;
modelData.scale = staticObjData->scale;
modelData.id = modelId++;
this->staticObjects.Push(new C_StaticObj()); this->staticObjects.Push(new C_StaticObj());
if(!this->staticObjects[this->staticObjects.Size() -1 ]->Init(modelData)) if(!this->staticObjects[this->staticObjects.Size() -1 ]->Init(modelData))
{
// the model don't exist
this->staticObjects.Remove(this->staticObjects.Size() -1 );
modelId--;
}
}
if((ObjectSpecialType)staticObjData->specialTypeID == ObjectSpecialType_World)
{ {
// the model don't exist modelData.modelPath.assign(staticObjData->ModelFile.begin(), staticObjData->ModelFile.end());
this->staticObjects.Remove(this->staticObjects.Size() -1 ); modelData.visible = true;
modelId--; modelData.position = Oyster::Math::Float3(0,0,0);
modelData.rotation = Oyster::Math::Quaternion::identity;
modelData.scale = Oyster::Math::Float3(300,300,300);
modelData.id = modelId++;
this->staticObjects.Push(new C_StaticObj());
if(!this->staticObjects[this->staticObjects.Size() -1 ]->Init(modelData))
{
// the model don't exist
this->staticObjects.Remove(this->staticObjects.Size() -1 );
modelId--;
}
}
else
{
modelData.modelPath.assign(staticObjData->ModelFile.begin(), staticObjData->ModelFile.end());
modelData.visible = true;
modelData.position = staticObjData->position;
modelData.rotation = Oyster::Math::Quaternion(Oyster::Math::Float3(staticObjData->rotation), staticObjData->rotation[3]);
modelData.scale = staticObjData->scale;
modelData.id = modelId++;
this->staticObjects.Push(new C_StaticObj());
if(!this->staticObjects[this->staticObjects.Size() -1 ]->Init(modelData))
{
// the model don't exist
this->staticObjects.Remove(this->staticObjects.Size() -1 );
modelId--;
}
} }
} }
break; break;

41
Code/Game/GameLogic/Level.cpp
View File

@ -43,6 +43,7 @@ Object* Level::createGameObj(ObjectHeader* obj, ICustomBody* rigidBody)
float worldSize = ((WorldAttributes*)obj)->worldSize; float worldSize = ((WorldAttributes*)obj)->worldSize;
float atmosphereSize = ((WorldAttributes*)obj)->atmoSphereSize; float atmosphereSize = ((WorldAttributes*)obj)->atmoSphereSize;
gameObj = new StaticObject(rigidBody, Object::DefaultCollisionAfter, (ObjectSpecialType)obj->specialTypeID, objID++); gameObj = new StaticObject(rigidBody, Object::DefaultCollisionAfter, (ObjectSpecialType)obj->specialTypeID, objID++);
} }
break; break;
@ -224,9 +225,39 @@ void Level::InitiateLevel(std::string levelPath)
staticObjData->ModelFile; staticObjData->ModelFile;
ICustomBody* rigidBody_Static = NULL; ICustomBody* rigidBody_Static = NULL;
if((ObjectSpecialType)staticObjData->specialTypeID == ObjectSpecialType_Sky)
{
}
if((ObjectSpecialType)staticObjData->specialTypeID == ObjectSpecialType_World)
{
Oyster::Math::Float3 rigidWorldPos;
Oyster::Math::Float4 rigidWorldRotation;
float rigidBodyMass;
float rigidBodyRadius;
//offset the rigidPosition from modelspace to worldspace;
rigidWorldPos = Oyster::Math::Float3(0,0,0);
//scales the position so the collision geomentry is in the right place
//offset the rigidRotation from modelspace to worldspace;
rigidWorldRotation = Oyster::Math::Float4(0,0,0,1);
//mass scaled
rigidBodyMass = 100;
//Radius scaled
rigidBodyRadius = 150;
//create the rigid body
rigidBody_Static = API::Instance().AddCollisionSphere( rigidBodyRadius , rigidWorldRotation , rigidWorldPos , rigidBodyMass, 1,1,1);
}
// collision shape // collision shape
if(staticObjData->boundingVolume.geoType == CollisionGeometryType_Sphere) else if(staticObjData->boundingVolume.geoType == CollisionGeometryType_Sphere)
{ {
rigidBody_Static = InitRigidBodySphere(staticObjData); rigidBody_Static = InitRigidBodySphere(staticObjData);
} }
@ -289,6 +320,14 @@ void Level::InitiateLevel(std::string levelPath)
case ObjectType::ObjectType_Light: case ObjectType::ObjectType_Light:
// read on client // read on client
break; break;
case ObjectType::ObjectType_SpawnPoint:
{
Oyster::Math::Float3 pos;
pos.x = ((SpawnPointAttributes*)obj)->position[0];
pos.y = ((SpawnPointAttributes*)obj)->position[1];
pos.z = ((SpawnPointAttributes*)obj)->position[2];
spawnPoints.Push(pos);
}
default: default:
break; break;
} }