diff options
| -rw-r--r-- | autobuild.xml | 4 | ||||
| -rw-r--r-- | indra/newview/llfloaterpathfindingconsole.cpp | 6 | ||||
| -rw-r--r-- | indra/newview/llfloaterpathfindingconsole.h | 4 | ||||
| -rw-r--r-- | indra/newview/llviewerdisplay.cpp | 13 |
4 files changed, 20 insertions, 7 deletions
diff --git a/autobuild.xml b/autobuild.xml index cafa3c911d..fe1f3f972b 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1822,9 +1822,9 @@ <key>archive</key> <map> <key>hash</key> - <string>8fd2f59e28161fc7cbdffad29925ac1e</string> + <string>935da383b9f98c34c36f9dcbceb1283e</string> <key>url</key> - <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary/rev/246954/arch/CYGWIN/installer/llpathinglibrary-0.1-windows-20111221.tar.bz2</string> + <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary/rev/247173/arch/CYGWIN/installer/llpathinglibrary-0.1-windows-20120104.tar.bz2</string> </map> <key>name</key> <string>windows</string> diff --git a/indra/newview/llfloaterpathfindingconsole.cpp b/indra/newview/llfloaterpathfindingconsole.cpp index f66930da79..3bf316fdf6 100644 --- a/indra/newview/llfloaterpathfindingconsole.cpp +++ b/indra/newview/llfloaterpathfindingconsole.cpp @@ -32,7 +32,6 @@ #include "llsd.h"
#include "llagent.h"
#include "llbutton.h"
-#include "llcheckboxctrl.h"
#include "llradiogroup.h"
#include "llsliderctrl.h"
#include "lllineeditor.h"
@@ -558,8 +557,9 @@ void LLFloaterPathfindingConsole::providePathingData( const LLVector3& point1, c break;
case kPathSelectEndPoint :
- mPathData.mStartPointB = point1;
- mPathData.mEndPointB = point2;
+ mPathData.mStartPointB = point1;
+ mPathData.mEndPointB = point2;
+ mPathData.mCharacterWidth = getCharacterWidth();
//prep#TODO# possibly consider an alternate behavior - perhaps add a "path" button to submit the data.
LLPathingLib::getInstance()->generatePath( mPathData );
break;
diff --git a/indra/newview/llfloaterpathfindingconsole.h b/indra/newview/llfloaterpathfindingconsole.h index 7a9328da57..9f9774b66b 100644 --- a/indra/newview/llfloaterpathfindingconsole.h +++ b/indra/newview/llfloaterpathfindingconsole.h @@ -31,9 +31,9 @@ #include "llfloater.h"
#include "llnavmeshstation.h"
#include "llpathinglib.h"
+#include "llcheckboxctrl.h"
class LLSD;
-class LLCheckBoxCtrl;
class LLRadioGroup;
class LLSliderCtrl;
class LLLineEditor;
@@ -95,6 +95,8 @@ public: F32 getTerrainMaterialD() const;
void setTerrainMaterialD(F32 pTerrainMaterial);
+ BOOL getShowPathToggle() const {return mShowPathCheckBox->get(); }
+
protected:
private:
diff --git a/indra/newview/llviewerdisplay.cpp b/indra/newview/llviewerdisplay.cpp index d710076228..2b2dd5ef7c 100644 --- a/indra/newview/llviewerdisplay.cpp +++ b/indra/newview/llviewerdisplay.cpp @@ -885,6 +885,7 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot) LLAppViewer::instance()->pingMainloopTimeout("Display:RenderGeom");
bool exclusiveDraw = false;
BOOL allowRenderables = false;
+ BOOL allowPathToBeDrawn = false;
if (!(LLAppViewer::instance()->logoutRequestSent() && LLAppViewer::instance()->hasSavedFinalSnapshot())
&& !gRestoreGL)
{
@@ -906,6 +907,11 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot) {
allowRenderables = true;
}
+ //Determine if we should also draw a user supplied path on top of the scene
+ if ( pFloater && pFloater->getShowPathToggle() )
+ {
+ allowPathToBeDrawn = true;
+ }
//Navmesh
if ( LLPathingLib::getInstance()->getRenderNavMeshState() )
{
@@ -929,7 +935,12 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot) gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
LLPathingLib::getInstance()->renderNavMeshShapesVBO();
exclusiveDraw = true;
- }
+ }
+ //User designated path
+ if ( allowPathToBeDrawn )
+ {
+ LLPathingLib::getInstance()->renderPath();
+ }
}
}
|