devZoGok/PlanetFleet
1
0
Fork 0
mirror of https://github.com/devZoGok/PlanetFleet.git synced 2026-08-26 19:43:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

removed TerrainObject struct

Browse Source
This commit is contained in:
devZoGok
2023-09-03 09:22:05 +03:00
parent c7f5914a04
commit 80dc5503be
9 changed files with 70 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
unitFrameController.cpp
+2 -2
View File
@@ -43,7 +43,7 @@ namespace battleship{
//TODO implement terrain evenness check
void UnitFrameController::update(){
Map *map = Map::getSingleton();
MeshData meshData = map->getTerrainObject(0).node->getMesh(0)->getMeshBase();
MeshData meshData;
MeshData::Vertex *verts = meshData.vertices;
int numVerts = 3 * meshData.numTris;
@@ -56,7 +56,7 @@ namespace battleship{
for(UnitFrame &s : unitFrames){
vector<Ray::CollisionResult> results;
Ray::retrieveCollisions(startPos, (endPos - startPos).norm(), map->getTerrainObject(0).node, results);
Ray::retrieveCollisions(startPos, (endPos - startPos).norm(), map->getNodeParent()->getChild(0), results);
Ray::sortResults(results);
if(!results.empty()){