CSPublic/Blocks3D
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed selection box error

Browse Source
This commit is contained in:
Vulpovile
2023-11-06 23:17:47 -08:00
parent 8726e1e3e3
commit 944afec7a3
5 changed files with 180 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/source/DataModelV2/SelectionService.cpp
View File

@@ -95,7 +95,7 @@ void drawOutline(Vector3 from, Vector3 to, RenderDevice* rd, Vector3 size, Vecto
//Y
Draw::box(c.toWorldSpace(Box(Vector3(from.x + offsetSize, from.y - offsetSize + 0.2, from.z + offsetSize), Vector3(from.x - offsetSize, to.y + offsetSize - 0.2, from.z - offsetSize))), rd, outline, Color4::clear());
Draw::box(c.toWorldSpace(Box(Vector3(to.x + offsetSize, from.y - offsetSize + 0.2, from.z + offsetSize), Vector3(to.x - offsetSize, to.y + offsetSize - 0.2, from.z - offsetSize))), rd, outline, Color4::clear());
Draw::box(c.toWorldSpace(Box(Vector3(to.x + offsetSize, from.y - offsetSize + 0.2, to.z + offsetSize), Vector3(to.x - offsetSize, to.y + offsetSize-0.1, to.z - offsetSize))), rd, outline, Color4::clear());
Draw::box(c.toWorldSpace(Box(Vector3(to.x + offsetSize, from.y - offsetSize + 0.2, to.z + offsetSize), Vector3(to.x - offsetSize, to.y + offsetSize-0.2, to.z - offsetSize))), rd, outline, Color4::clear());
Draw::box(c.toWorldSpace(Box(Vector3(from.x + offsetSize, from.y - offsetSize + 0.2, to.z + offsetSize), Vector3(from.x - offsetSize, to.y + offsetSize - 0.2, to.z - offsetSize))), rd, outline, Color4::clear());
//Z

22
src/source/DataModelV3/LevelInstance.cpp
View File

@@ -1,4 +1,4 @@
//#include "DataModelV3/DataModelInstance.h"
#include "DataModelV3/DataModelInstance.h"
#include "DataModelV3/LevelInstance.h"
using namespace B3D;
@@ -28,28 +28,28 @@ LevelInstance::~LevelInstance(void)
void LevelInstance::winCondition()
{
//DataModelInstance* DataModel = (DataModelInstance*)getParent(); //If level parent gets changed to something other than Datamodel it could cause nasty data corruption bugs
//DataModel->setMessage(winMessage);
//DataModel->toggleRun();
DataModelInstance* DataModel = parentDataModel; //If level parent gets changed to something other than Datamodel it could cause nasty data corruption bugs
DataModel->setMessage(winMessage.getValue());
DataModel->toggleRun();
}
void LevelInstance::loseCondition()
{
//DataModelInstance* DataModel = (DataModelInstance*)getParent();
//DataModel->setMessage(loseMessage);
//DataModel->toggleRun();
DataModelInstance* DataModel = parentDataModel;
DataModel->setMessage(loseMessage.getValue());
DataModel->toggleRun();
}
void LevelInstance::pauseCondition()
{
//DataModelInstance* DataModel = (DataModelInstance*)getParent();
//DataModel->toggleRun();
DataModelInstance* DataModel = parentDataModel;
DataModel->toggleRun();
}
void LevelInstance::drawCondition()
{
//DataModelInstance* DataModel = (DataModelInstance*)getParent();
//DataModel->toggleRun();
DataModelInstance* DataModel = parentDataModel;
DataModel->toggleRun();
}
void LevelInstance::Step(SimTime sdt)

2
src/source/DataModelV3/SelectionService.cpp
View File

@@ -99,7 +99,7 @@ void SelectionService::drawOutline(Vector3 from, Vector3 to, RenderDevice* rd, V
//Y
Draw::box(c.toWorldSpace(Box(Vector3(from.x + offsetSize, from.y - offsetSize + 0.2, from.z + offsetSize), Vector3(from.x - offsetSize, to.y + offsetSize - 0.2, from.z - offsetSize))), rd, outline, Color4::clear());
Draw::box(c.toWorldSpace(Box(Vector3(to.x + offsetSize, from.y - offsetSize + 0.2, from.z + offsetSize), Vector3(to.x - offsetSize, to.y + offsetSize - 0.2, from.z - offsetSize))), rd, outline, Color4::clear());
Draw::box(c.toWorldSpace(Box(Vector3(to.x + offsetSize, from.y - offsetSize + 0.2, to.z + offsetSize), Vector3(to.x - offsetSize, to.y + offsetSize-0.1, to.z - offsetSize))), rd, outline, Color4::clear());
Draw::box(c.toWorldSpace(Box(Vector3(to.x + offsetSize, from.y - offsetSize + 0.2, to.z + offsetSize), Vector3(to.x - offsetSize, to.y + offsetSize-0.2, to.z - offsetSize))), rd, outline, Color4::clear());
Draw::box(c.toWorldSpace(Box(Vector3(from.x + offsetSize, from.y - offsetSize + 0.2, to.z + offsetSize), Vector3(from.x - offsetSize, to.y + offsetSize - 0.2, to.z - offsetSize))), rd, outline, Color4::clear());
//Z