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

shifting landmass cell markers after weights calculation

Browse Source
This commit is contained in:
devZoGok
2023-02-05 16:48:54 +02:00
parent 653a67e03b
commit 701afbca39
3 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
map.h
+2
View File
@@ -33,6 +33,7 @@ namespace battleship{
vb01::Vector3 pos, size, cellSize;
Type type;
vb01::Node *node = nullptr;
std::vector<vb01::Node*> cellMarkers;
int numCells;
Cell *cells = nullptr;
vb01::u32 **weights = nullptr;
@@ -64,6 +65,7 @@ namespace battleship{
inline int getNumTerrainObjects(){return terrainObjects.size();}
inline vb01::Node* getNodeParent(){return nodeParent;}
inline vb01::Vector3 getCellSize(){return cellSize;}
inline std::vector<TerrainObject>& getTerrainObjects(){return terrainObjects;}
inline std::vector<Player*> getPlayers() {return players;}
inline Player* getPlayer(int i){return players[i];}
inline void addPlayer(Player *p){players.push_back(p);}
mapEditorAppState.cpp
+17 -4
View File
@@ -385,15 +385,27 @@ namespace battleship{
void MapEditorAppState::MapEditor::prepareTerrainObject(u32 **weights, Cell *cells, int cellsByDim[3], float height, bool land){
const int numCells = cellsByDim[0] * cellsByDim[1] * cellsByDim[2];
Vector3 initPos = -.5 * Vector3(mapSize.x, -height, mapSize.y);
Node *landmass = map->getTerrainObject(0).node;
for(int i = 0; i < numCells; i++){
int xId = i % cellsByDim[0];
int yId = int(i / (cellsByDim[0] * cellsByDim[2]));
int zId = (int(i / cellsByDim[0])) % cellsByDim[2];
cells[i].pos = initPos + Vector3(xId * cellLength, -yId * cellDepth, zId * cellWidth);
if(land){
vector<Ray::CollisionResult> res;
Ray::retrieveCollisions(Vector3(cells[i].pos.x, 100, cells[i].pos.z), -Vector3::VEC_J, landmass, res);
Ray::sortResults(res);
if(!res.empty())
cells[i].pos.y = res[0].pos.y;
}
}
MeshData meshData = map->getTerrainObject(0).node->getMesh(0)->getMeshBase();
MeshData meshData = landmass->getMesh(0)->getMeshBase();
for(int i = 0; i < numCells; i++){
int waterbodyId = -1;
@@ -597,8 +609,9 @@ namespace battleship{
void MapEditorAppState::MapEditor::toggleCellMarkers(){
cellMarkersVisible = !cellMarkersVisible;
for(Node *cm : cellMarkers)
cm->setVisible(cellMarkersVisible);
for(TerrainObject &obj : map->getTerrainObjects())
for(Node *cellMarker : obj.cellMarkers)
cellMarker->setVisible(cellMarkersVisible);
}
void MapEditorAppState::MapEditor::prepareCellMarkers(TerrainObject &obj){
@@ -618,7 +631,7 @@ namespace battleship{
cellMarker->attachMesh(box);
cellMarker->setVisible(cellMarkersVisible);
rootNode->attachChild(cellMarker);
cellMarkers.push_back(cellMarker);
obj.cellMarkers.push_back(cellMarker);
}
}
mapEditorAppState.h
-1
View File
@@ -81,7 +81,6 @@ namespace battleship{
float circleRadius = MIN_RADIUS, guiThreshold = 200;
vb01::Vector3 pushPos = vb01::Vector3::VEC_ZERO;
vb01::Vector2 mapSize;
std::vector<vb01::Node*> cellMarkers;
std::vector<vb01::Texture*> skyTextures, landmassTextures, waterTextures;
UnitListbox *vehicleListbox = nullptr, *structureListbox = nullptr;
};