devZoGok/PlanetFleet
1
0
Fork 0
mirror of https://github.com/devZoGok/PlanetFleet.git synced 2026-08-27 03:53:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

implemented landmass vert shifting

Browse Source
This commit is contained in:
devZoGok
2023-01-04 11:13:43 +02:00
parent 81ea1b452a
commit d38823d7f9
5 changed files with 134 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mapEditorAppState.cpp
+74 -2
View File
@@ -10,6 +10,7 @@
#include "mesh.h"
#include "util.h"
#include <ray.h>
#include <box.h>
#include <node.h>
#include <quad.h>
@@ -61,6 +62,33 @@ namespace battleship{
assetManager->load(DEFAULT_TEXTURE);
}
void MapEditorAppState::MapEditor::updateCircleRadius(bool increase){
circleRadius += (increase ? INCREASE_RATE : -INCREASE_RATE);
if(circleRadius > MAX_RADIUS)
circleRadius = MAX_RADIUS;
else if(circleRadius < MIN_RADIUS)
circleRadius = MIN_RADIUS;
}
void MapEditorAppState::MapEditor::pushLandmassVerts(float strength){
Mesh *mesh = map->getTerrainObject(0).node->getChild(0)->getMesh(0);
MeshData meshData = mesh->getMeshBase();
MeshData::Vertex *verts = meshData.vertices;
int numVerts = meshData.numTris * 3;
for(int i = 0; i < numVerts; i++){
Vector3 distVec = verts[i].pos - pushPos;
distVec.y = 0;
float dist = distVec.getLength();
if(dist < circleRadius)
verts[i].pos.y += 10 * strength * dist / circleRadius;
}
mesh->updateVerts(meshData);
}
//TODO fix crash when using 100 side verts
void MapEditorAppState::MapEditor::generatePlane(Vector2 size){
int numSideVerts = 10, numIndices = 6 * (numSideVerts - 1) * (numSideVerts - 1);
@@ -240,9 +268,11 @@ namespace battleship{
}
void MapEditorAppState::update(){
radiusText->setText(L"Radius: " + to_wstring(mapEditor->getCircleRadius()));
CameraController *camCtr = CameraController::getSingleton();
if(!camCtr->isLookingAround())
if(!(camCtr->isLookingAround() || mapEditor->isPushing()))
camCtr->updateCameraPosition();
UnitFrameController *ufCtr = UnitFrameController::getSingleton();
@@ -254,6 +284,18 @@ namespace battleship{
void MapEditorAppState::onAttached(){
AbstractAppState::onAttached();
mapEditor = new MapEditor(mapName, mapSize);
Root *root = Root::getSingleton();
Material *mat = new Material(root->getLibPath() + "text");
mat->addBoolUniform("texturingEnabled", false);
mat->addVec4Uniform("diffuseColor", Vector4::VEC_IJKL);
radiusText = new Text(GameManager::getSingleton()->getPath() + "Fonts/batang.ttf", L"");
radiusText->setMaterial(mat);
Node *node = new Node(Vector3(0, 100, 0));
node->addText(radiusText);
root->getGuiNode()->attachChild(node);
}
void MapEditorAppState::onDettached(){}
@@ -276,6 +318,32 @@ namespace battleship{
ufCtr->removeUnitFrames();
ufCtr->setPlacingFrames(false);
break;
case Bind::INCREASE_RADIUS:
if(isPressed) mapEditor->updateCircleRadius(true);
break;
case Bind::DECREASE_RADIUS:
if(isPressed) mapEditor->updateCircleRadius(false);
break;
case Bind::LEFT_CLICK:
if(isPressed){
Camera *cam = Root::getSingleton()->getCamera();
Vector3 startPos = cam->getPosition();
Vector3 endPos = screenToSpace(getCursorPos());
vector<Ray::CollisionResult> results;
Ray::retrieveCollisions(startPos, (endPos - startPos).norm(), Map::getSingleton()->getTerrainObject(0).node, results);
Ray::sortResults(results);
bool push = !results.empty();
mapEditor->setPushing(push);
if(push)
mapEditor->setPushPos(results[0].pos);
}
else
mapEditor->setPushing(false);
break;
}
}
@@ -288,7 +356,7 @@ namespace battleship{
if(camCtr->isLookingAround()){
Vector3 dirProj = Root::getSingleton()->getCamera()->getDirection();
dirProj = Vector3(dirProj.x, 0, dirProj.z).norm();
CameraController::getSingleton()->orientCamera(Vector3(0, 1, 0).cross(dirProj), strength);
camCtr->orientCamera(Vector3(0, 1, 0).cross(dirProj), strength);
}
break;
@@ -298,6 +366,10 @@ namespace battleship{
camCtr->orientCamera(Vector3(0, 1, 0), strength);
break;
case Bind::PUSH_VERTS_UP:
case Bind::PUSH_VERTS_DOWN:
if(mapEditor->isPushing()) mapEditor->pushLandmassVerts(strength);
break;
}
}
}