mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-19 19:53:53 +00:00
Code Issues Releases Wiki Activity

Changes to color scheme, slight change to drag indicator,

Browse source 
change tooltip description.
This commit is contained in:
Aesylwinn 2016-05-29 13:26:29 -04:00
parent 90620081c7
commit b83f522ecd
4 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
apps/opencs/view/render/pathgrid.cpp
View file

@ -204,7 +204,7 @@ namespace CSVRender
osg::Vec3f start = osg::Vec3f(pointA.mX, pointA.mY, pointA.mZ + SceneUtil::DiamondHalfHeight); osg::Vec3f start = osg::Vec3f(pointA.mX, pointA.mY, pointA.mZ + SceneUtil::DiamondHalfHeight);
osg::Vec3f end = osg::Vec3f(pointB.mX, pointB.mY, pointB.mZ + SceneUtil::DiamondHalfHeight); osg::Vec3f end = osg::Vec3f(pointB.mX, pointB.mY, pointB.mZ + SceneUtil::DiamondHalfHeight);
createConnectionGeometry(start, end); createConnectionGeometry(start, end, true);
} }
} }
} }
@ -220,7 +220,7 @@ namespace CSVRender
osg::Vec3f start = osg::Vec3f(point.mX, point.mY, point.mZ + SceneUtil::DiamondHalfHeight); osg::Vec3f start = osg::Vec3f(point.mX, point.mY, point.mZ + SceneUtil::DiamondHalfHeight);
osg::Vec3f end = pos - mBaseNode->getPosition(); osg::Vec3f end = pos - mBaseNode->getPosition();
createConnectionGeometry(start, end); createConnectionGeometry(start, end, false);
} }
} }
} }
@ -593,7 +593,7 @@ namespace CSVRender
} }
} }
void Pathgrid::createConnectionGeometry(const osg::Vec3f& start, const osg::Vec3f& end) void Pathgrid::createConnectionGeometry(const osg::Vec3f& start, const osg::Vec3f& end, bool valid)
{ {
if (mConnectionGeometry) if (mConnectionGeometry)
mPathgridGeode->removeDrawable(mConnectionGeometry); mPathgridGeode->removeDrawable(mConnectionGeometry);
@ -606,7 +606,16 @@ namespace CSVRender
(*vertices)[0] = start; (*vertices)[0] = start;
(*vertices)[1] = end; (*vertices)[1] = end;
(*colors)[0] = osg::Vec4f(0.4f, 1.f, 0.4f, 1.f);
if (valid)
{
(*colors)[0] = osg::Vec4f(0.91f, 0.66f, 1.f, 1.f);
}
else
{
(*colors)[0] = osg::Vec4f(1.f, 0.f, 0.f, 1.f);
}
indices->setElement(0, 0); indices->setElement(0, 0);
indices->setElement(1, 1); indices->setElement(1, 1);

2
apps/opencs/view/render/pathgrid.hpp
View file

@ -121,7 +121,7 @@ namespace CSVRender
void removePathgridGeometry(); void removePathgridGeometry();
void removeSelectedGeometry(); void removeSelectedGeometry();
void createConnectionGeometry(const osg::Vec3f& start, const osg::Vec3f& end); void createConnectionGeometry(const osg::Vec3f& start, const osg::Vec3f& end, bool valid);
const CSMWorld::Pathgrid* getPathgridSource(); const CSMWorld::Pathgrid* getPathgridSource();

1
apps/opencs/view/render/pathgridmode.cpp
View file

@ -37,7 +37,6 @@ namespace CSVRender
"<li>Secondary edit: Connect selected nodes to node</li>" "<li>Secondary edit: Connect selected nodes to node</li>"
"<li>Primary drag: Move selected nodes</li>" "<li>Primary drag: Move selected nodes</li>"
"<li>Secondary drag: Connect one node to another</li>" "<li>Secondary drag: Connect one node to another</li>"
"<li>Other operations may be done with the context menu</li>"
"</ul><p>Note: Only a single cell's pathgrid may be edited at a time"); "</ul><p>Note: Only a single cell's pathgrid may be edited at a time");
} }

4
components/sceneutil/pathgridutil.cpp
View file

@ -71,8 +71,8 @@ namespace SceneUtil
}; };
const osg::Vec4f DiamondEdgeColor = osg::Vec4f(0.5f, 1.f, 1.f, 1.f); const osg::Vec4f DiamondEdgeColor = osg::Vec4f(0.5f, 1.f, 1.f, 1.f);
const osg::Vec4f DiamondWireColor = osg::Vec4f(0.8f, 1.f, 0.9f, 1.f); const osg::Vec4f DiamondWireColor = osg::Vec4f(0.72f, 0.f, 0.96f, 1.f);
const osg::Vec4f DiamondFocusWireColor = osg::Vec4f(0.4f, 1.f, 0.4f, 1.f); const osg::Vec4f DiamondFocusWireColor = osg::Vec4f(0.91f, 0.66f, 1.f, 1.f);
osg::ref_ptr<osg::Geometry> createPathgridGeometry(const ESM::Pathgrid& pathgrid) osg::ref_ptr<osg::Geometry> createPathgridGeometry(const ESM::Pathgrid& pathgrid)
{ {