livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Pull and merge from https://bitbucket.org/stinson_linden/viewer-development-havokai.

meow-7.2.2
Todd Stinson 2012-01-04 16:16:40 -08:00
parent 10614ebd91 96e8d4876a
commit 7cae41cd59
4 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
autobuild.xml
View File

@ -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>

6
indra/newview/llfloaterpathfindingconsole.cpp
View File

@ -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;

4
indra/newview/llfloaterpathfindingconsole.h
View File

@ -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:

13
indra/newview/llviewerdisplay.cpp
View File

@ -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();
}
}
}