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

Merge branch 'develop' into imp-55-pathfinding

Browse Source
This commit is contained in:
devZoGok
2024-01-06 15:36:59 +02:00
parent 5b34058ac7 5a0f85a939
commit bd8135bdff
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
external/vb01
Vendored
+1 -1
Submodule external/vb01 updated: ea67e6ae5b...8d7a88688c
mapEditorAppState.cpp
+12 -1
View File
@@ -249,6 +249,17 @@ namespace battleship{
XMLElement *nodeEl = doc->NewElement(nodeTagName);
nodeEl->SetAttribute("name", "plane");
Node *landmassNode = map->getNodeParent()->getChild(0);
nodeEl->SetAttribute("px", landmassNode->getPosition().x);
nodeEl->SetAttribute("py", landmassNode->getPosition().y);
nodeEl->SetAttribute("pz", landmassNode->getPosition().z);
nodeEl->SetAttribute("rw", landmassNode->getOrientation().w);
nodeEl->SetAttribute("rx", landmassNode->getOrientation().x);
nodeEl->SetAttribute("ry", landmassNode->getOrientation().y);
nodeEl->SetAttribute("rz", landmassNode->getOrientation().z);
nodeEl->SetAttribute("sx", landmassNode->getScale().x);
nodeEl->SetAttribute("sy", landmassNode->getScale().y);
nodeEl->SetAttribute("sz", landmassNode->getScale().z);
XMLNode *nodeTag = rootTag->InsertEndChild(nodeEl);
XMLElement *meshEl = doc->NewElement("mesh");
@@ -306,7 +317,7 @@ namespace battleship{
for(int i = 0; i < numVertCells; i++)
for(int j = 0; j < numHorCells; j++){
Vector3 rayPos = startPos + Vector3(cellSize.x * j, 100, cellSize.z * i);
vector<RayCaster::CollisionResult> res = RayCaster::cast(rayPos, -Vector3::VEC_J, terrainNode->getChild(0));
vector<RayCaster::CollisionResult> res = RayCaster::cast(rayPos, -Vector3::VEC_J, terrainNode->getChild(0), 0, 4);
if(res.empty()){
RayCaster::CollisionResult r;