From f8b43b2a64562046fdafed80df36686b64642426 Mon Sep 17 00:00:00 2001 From: Aesylwinn Date: Fri, 13 May 2016 12:55:35 -0400 Subject: [PATCH] Rename cryptic variables. --- apps/opencs/view/render/pathgridmode.cpp | 6 +++--- apps/opencs/view/render/worldspacewidget.cpp | 12 ++++++------ apps/opencs/view/render/worldspacewidget.hpp | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/apps/opencs/view/render/pathgridmode.cpp b/apps/opencs/view/render/pathgridmode.cpp index 93b6a747d..d38390025 100644 --- a/apps/opencs/view/render/pathgridmode.cpp +++ b/apps/opencs/view/render/pathgridmode.cpp @@ -36,7 +36,7 @@ namespace CSVRender { if (PathgridTag* tag = dynamic_cast(hit.tag.get())) { - unsigned short node = SceneUtil::getPathgridNode(static_cast(hit.i0)); + unsigned short node = SceneUtil::getPathgridNode(static_cast(hit.index0)); tag->getPathgrid()->toggleSelected(node); } } @@ -54,7 +54,7 @@ namespace CSVRender mLastId = tag->getPathgrid()->getId(); } - unsigned short node = SceneUtil::getPathgridNode(static_cast(hit.i0)); + unsigned short node = SceneUtil::getPathgridNode(static_cast(hit.index0)); tag->getPathgrid()->toggleSelected(node); return; @@ -86,7 +86,7 @@ namespace CSVRender if (PathgridTag* tag = dynamic_cast(hit.tag.get())) { mDragMode = DragMode_Edge; - mFromNode = SceneUtil::getPathgridNode(static_cast(hit.i0)); + mFromNode = SceneUtil::getPathgridNode(static_cast(hit.index0)); return true; } } diff --git a/apps/opencs/view/render/worldspacewidget.cpp b/apps/opencs/view/render/worldspacewidget.cpp index 5963107e9..cd65bd8e8 100644 --- a/apps/opencs/view/render/worldspacewidget.cpp +++ b/apps/opencs/view/render/worldspacewidget.cpp @@ -501,9 +501,9 @@ CSVRender::WorldspaceHitResult CSVRender::WorldspaceWidget::mousePick (const QPo WorldspaceHitResult hit = { true, tag, 0, 0, 0, intersection.getWorldIntersectPoint() }; if (intersection.indexList.size() >= 3) { - hit.i0 = intersection.indexList[0]; - hit.i1 = intersection.indexList[1]; - hit.i2 = intersection.indexList[2]; + hit.index0 = intersection.indexList[0]; + hit.index1 = intersection.indexList[1]; + hit.index2 = intersection.indexList[2]; } return hit; } @@ -513,9 +513,9 @@ CSVRender::WorldspaceHitResult CSVRender::WorldspaceWidget::mousePick (const QPo WorldspaceHitResult hit = { true, 0, 0, 0, 0, intersection.getWorldIntersectPoint() }; if (intersection.indexList.size() >= 3) { - hit.i0 = intersection.indexList[0]; - hit.i1 = intersection.indexList[1]; - hit.i2 = intersection.indexList[2]; + hit.index0 = intersection.indexList[0]; + hit.index1 = intersection.indexList[1]; + hit.index2 = intersection.indexList[2]; } return hit; } diff --git a/apps/opencs/view/render/worldspacewidget.hpp b/apps/opencs/view/render/worldspacewidget.hpp index 4160da3d8..2cf866342 100644 --- a/apps/opencs/view/render/worldspacewidget.hpp +++ b/apps/opencs/view/render/worldspacewidget.hpp @@ -40,7 +40,7 @@ namespace CSVRender { bool hit; osg::ref_ptr tag; - unsigned int i0, i1, i2; + unsigned int index0, index1, index2; // indices of mesh vertices osg::Vec3d worldPos; };