diff --git a/external/vb01 b/external/vb01 index ea67e6a..8d7a886 160000 --- a/external/vb01 +++ b/external/vb01 @@ -1 +1 @@ -Subproject commit ea67e6ae5b732e8409ea2232c89087aa9cbf92d3 +Subproject commit 8d7a88688c6ac93e9d40a181aded07351b848d77 diff --git a/mapEditorAppState.cpp b/mapEditorAppState.cpp index ebf1f17..4d44b4c 100644 --- a/mapEditorAppState.cpp +++ b/mapEditorAppState.cpp @@ -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 res = RayCaster::cast(rayPos, -Vector3::VEC_J, terrainNode->getChild(0)); + vector res = RayCaster::cast(rayPos, -Vector3::VEC_J, terrainNode->getChild(0), 0, 4); if(res.empty()){ RayCaster::CollisionResult r;