mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-04-18 11:36:49 +00:00
Code Issues Releases Wiki Activity

clean-up, improve formatting

Browse source
This commit is contained in:
Nelsson Huotari 2020-03-19 11:18:54 +02:00
parent 75f6577f61
commit 17cb3414d8
2 changed files with 22 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
apps/opencs/view/render/instancemode.cpp
View file

@ -700,7 +700,7 @@ void CSVRender::InstanceMode::deleteSelectedInstances(bool active)
void CSVRender::InstanceMode::dropInstance(DropMode dropMode, CSVRender::Object* object, float objectHeight) void CSVRender::InstanceMode::dropInstance(DropMode dropMode, CSVRender::Object* object, float objectHeight)
{ {
const osg::Vec3d& point = object->getPosition().asVec3(); osg::Vec3d point = object->getPosition().asVec3();
osg::Vec3d start = point; osg::Vec3d start = point;
start.z() += objectHeight; start.z() += objectHeight;
@ -712,8 +712,10 @@ void CSVRender::InstanceMode::dropInstance(DropMode dropMode, CSVRender::Object*
intersector->setIntersectionLimit(osgUtil::LineSegmentIntersector::NO_LIMIT); intersector->setIntersectionLimit(osgUtil::LineSegmentIntersector::NO_LIMIT);
osgUtil::IntersectionVisitor visitor(intersector); osgUtil::IntersectionVisitor visitor(intersector);
if (dropMode == Terrain_sep) visitor.setTraversalMask(SceneUtil::Mask_Terrain); if (dropMode == TerrainSep)
if (dropMode == Collision_sep) visitor.setTraversalMask(SceneUtil::Mask_Terrain | SceneUtil::Mask_EditorReference); visitor.setTraversalMask(SceneUtil::Mask_Terrain);
if (dropMode == CollisionSep)
visitor.setTraversalMask(SceneUtil::Mask_Terrain | SceneUtil::Mask_EditorReference);
mParentNode->accept(visitor); mParentNode->accept(visitor);
@ -732,7 +734,7 @@ void CSVRender::InstanceMode::dropInstance(DropMode dropMode, CSVRender::Object*
float CSVRender::InstanceMode::getDropHeight(DropMode dropMode, CSVRender::Object* object, float objectHeight) float CSVRender::InstanceMode::getDropHeight(DropMode dropMode, CSVRender::Object* object, float objectHeight)
{ {
const osg::Vec3d& point = object->getPosition().asVec3(); osg::Vec3d point = object->getPosition().asVec3();
osg::Vec3d start = point; osg::Vec3d start = point;
start.z() += objectHeight; start.z() += objectHeight;
@ -744,8 +746,10 @@ float CSVRender::InstanceMode::getDropHeight(DropMode dropMode, CSVRender::Objec
intersector->setIntersectionLimit(osgUtil::LineSegmentIntersector::NO_LIMIT); intersector->setIntersectionLimit(osgUtil::LineSegmentIntersector::NO_LIMIT);
osgUtil::IntersectionVisitor visitor(intersector); osgUtil::IntersectionVisitor visitor(intersector);
if (dropMode == Terrain) visitor.setTraversalMask(SceneUtil::Mask_Terrain); if (dropMode == Terrain)
if (dropMode == Collision) visitor.setTraversalMask(SceneUtil::Mask_Terrain | SceneUtil::Mask_EditorReference); visitor.setTraversalMask(SceneUtil::Mask_Terrain);
if (dropMode == Collision)
visitor.setTraversalMask(SceneUtil::Mask_Terrain | SceneUtil::Mask_EditorReference);
mParentNode->accept(visitor); mParentNode->accept(visitor);
@ -772,18 +776,19 @@ void CSVRender::InstanceMode::dropSelectedInstancesToTerrain()
void CSVRender::InstanceMode::dropSelectedInstancesToCollisionSeparately() void CSVRender::InstanceMode::dropSelectedInstancesToCollisionSeparately()
{ {
handleDropMethod(Terrain_sep, "Drop instances to next collision level separately"); handleDropMethod(TerrainSep, "Drop instances to next collision level separately");
} }
void CSVRender::InstanceMode::dropSelectedInstancesToTerrainSeparately() void CSVRender::InstanceMode::dropSelectedInstancesToTerrainSeparately()
{ {
handleDropMethod(Collision_sep, "Drop instances to terrain level separately"); handleDropMethod(CollisionSep, "Drop instances to terrain level separately");
} }
void CSVRender::InstanceMode::handleDropMethod(DropMode dropMode, QString commandMsg) void CSVRender::InstanceMode::handleDropMethod(DropMode dropMode, QString commandMsg)
{ {
std::vector<osg::ref_ptr<TagBase> > selection = getWorldspaceWidget().getSelection (SceneUtil::Mask_EditorReference); std::vector<osg::ref_ptr<TagBase> > selection = getWorldspaceWidget().getSelection (SceneUtil::Mask_EditorReference);
if (selection.empty()) return; if (selection.empty())
return;
CSMDoc::Document& document = getWorldspaceWidget().getDocument(); CSMDoc::Document& document = getWorldspaceWidget().getDocument();
QUndoStack& undoStack = document.getUndoStack(); QUndoStack& undoStack = document.getUndoStack();
@ -803,7 +808,8 @@ void CSVRender::InstanceMode::handleDropMethod(DropMode dropMode, QString comman
if (CSVRender::ObjectTag *objectTag = dynamic_cast<CSVRender::ObjectTag *> (tag.get())) if (CSVRender::ObjectTag *objectTag = dynamic_cast<CSVRender::ObjectTag *> (tag.get()))
{ {
float thisDrop = getDropHeight(dropMode, objectTag->mObject, dropObjectDataHandler.mObjectHeights[counter]); float thisDrop = getDropHeight(dropMode, objectTag->mObject, dropObjectDataHandler.mObjectHeights[counter]);
if (thisDrop < smallestDropHeight) smallestDropHeight = thisDrop; if (thisDrop < smallestDropHeight)
smallestDropHeight = thisDrop;
counter++; counter++;
} }
for(osg::ref_ptr<TagBase> tag: selection) for(osg::ref_ptr<TagBase> tag: selection)
@ -818,8 +824,8 @@ void CSVRender::InstanceMode::handleDropMethod(DropMode dropMode, QString comman
} }
break; break;
case Terrain_sep: case TerrainSep:
case Collision_sep: case CollisionSep:
{ {
int counter = 0; int counter = 0;
for(osg::ref_ptr<TagBase> tag: selection) for(osg::ref_ptr<TagBase> tag: selection)
@ -831,9 +837,6 @@ void CSVRender::InstanceMode::handleDropMethod(DropMode dropMode, QString comman
} }
} }
break; break;
default:
break;
} }
} }
@ -853,7 +856,8 @@ CSVRender::DropObjectDataHandler::DropObjectDataHandler(WorldspaceWidget* worlds
objectNodeWithoutGUI->accept(computeBounds); objectNodeWithoutGUI->accept(computeBounds);
osg::BoundingBox bounds = computeBounds.getBoundingBox(); osg::BoundingBox bounds = computeBounds.getBoundingBox();
float boundingBoxOffset = 0.0f; float boundingBoxOffset = 0.0f;
if (bounds.valid()) boundingBoxOffset = bounds.zMin(); if (bounds.valid())
boundingBoxOffset = bounds.zMin();
mObjectHeights.emplace_back(boundingBoxOffset); mObjectHeights.emplace_back(boundingBoxOffset);
mOldMasks.emplace_back(objectNodeWithGUI->getNodeMask()); mOldMasks.emplace_back(objectNodeWithGUI->getNodeMask());

4
apps/opencs/view/render/instancemode.hpp
View file

@ -37,8 +37,8 @@ namespace CSVRender
{ {
Collision, Collision,
Terrain, Terrain,
Collision_sep, CollisionSep,
Terrain_sep Terrainsep
}; };
CSVWidget::SceneToolMode *mSubMode; CSVWidget::SceneToolMode *mSubMode;