PATH-192 FIX fixed last issues with convex decomp merge
Nyx (Neal Orman)
parent
78e96466cb
commit
f19a77047d
|
|
@ -1110,9 +1110,9 @@
|
|||
<key>archive</key>
|
||||
<map>
|
||||
<key>hash</key>
|
||||
<string>49f3d038379af818f9fc8f57cc4e313f</string>
|
||||
<string>e26b6d955394e079a151ad3b0d7d5c90</string>
|
||||
<key>url</key>
|
||||
<string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary/rev/248427/arch/Linux/installer/llphysicsextensions-0.1-linux-20120126.tar.bz2</string>
|
||||
<string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary/rev/248566/arch/Linux/installer/llphysicsextensions-0.1-linux-20120127.tar.bz2</string>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>linux</string>
|
||||
|
|
@ -1122,9 +1122,9 @@
|
|||
<key>archive</key>
|
||||
<map>
|
||||
<key>hash</key>
|
||||
<string>573a0daa04bde79bd7b7b338984dfbf3</string>
|
||||
<string>0afb3d1e08c56c74db31ae3e78640abc</string>
|
||||
<key>url</key>
|
||||
<string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary/rev/248427/arch/CYGWIN/installer/llphysicsextensions-0.1-windows-20120125.tar.bz2</string>
|
||||
<string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary/rev/248567/arch/CYGWIN/installer/llphysicsextensions-0.1-windows-20120127.tar.bz2</string>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>windows</string>
|
||||
|
|
|
|||
|
|
@ -1,14 +1,21 @@
|
|||
# -*- cmake -*-
|
||||
include(Prebuilt)
|
||||
|
||||
use_prebuilt_binary(llphysicsextensions)
|
||||
if (INSTALL_PROPRIETARY AND NOT STANDALONE)
|
||||
use_prebuilt_binary(llphysicsextensions)
|
||||
set(LLPHYSICS_EXTENSIONS_LIB_NAME llphysicsextensions)
|
||||
else (INSTALL_PROPRIETARY AND NOT STANDALONE)
|
||||
use_prebuilt_binary(llphysicsextensionsstub)
|
||||
set(LLPHYSICS_EXTENSIONS_LIB_NAME llphysicsextensionsstub)
|
||||
endif (INSTALL_PROPRIETARY AND NOT STANDALONE)
|
||||
|
||||
set(LLPHYSICS_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/lib/include)
|
||||
|
||||
set(LLPHYSICS_DEBUG_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/lib/debug)
|
||||
set(LLPHYSICS_RELEASE_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/lib/release)
|
||||
|
||||
find_library(LL_PHYSICS_DEBUG_LIB llphysicsextensions PATHS ${LLPHYSICS_DEBUG_LIBRARY_PATH})
|
||||
find_library(LL_PHYSICS_RELEASE_LIB llphysicsextensions PATHS ${LLPHYSICS_RELEASE_LIBRARY_PATH})
|
||||
find_library(LL_PHYSICS_DEBUG_LIB ${LLPHYSICS_EXTENSIONS_LIB_NAME} PATHS ${LLPHYSICS_DEBUG_LIBRARY_PATH})
|
||||
find_library(LL_PHYSICS_RELEASE_LIB ${LLPHYSICS_EXTENSIONS_LIB_NAME} PATHS ${LLPHYSICS_RELEASE_LIBRARY_PATH})
|
||||
|
||||
set(LLPHYSICS_LIBRARIES
|
||||
|
||||
|
|
@ -21,11 +28,3 @@ if (LINUX)
|
|||
list(APPEND LLPHYSICS_LIBRARIES -Wl,--end-group)
|
||||
endif (LINUX)
|
||||
|
||||
# if (INSTALL_PROPRIETARY AND NOT STANDALONE)
|
||||
# use_prebuilt_binary(llconvexdecomposition)
|
||||
# set(LLCONVEXDECOMP_LIBRARY llconvexdecomposition)
|
||||
# else (INSTALL_PROPRIETARY AND NOT STANDALONE)
|
||||
# use_prebuilt_binary(llconvexdecompositionstub)
|
||||
# set(LLCONVEXDECOMP_LIBRARY llconvexdecompositionstub)
|
||||
# endif (INSTALL_PROPRIETARY AND NOT STANDALONE)
|
||||
|
||||
|
|
|
|||
|
|
@ -106,6 +106,7 @@
|
|||
#include "llvfsthread.h"
|
||||
#include "llvolumemgr.h"
|
||||
#include "llxfermanager.h"
|
||||
#include "llphysicsextensions.h"
|
||||
|
||||
#include "llnotificationmanager.h"
|
||||
#include "llnotifications.h"
|
||||
|
|
@ -1543,6 +1544,9 @@ bool LLAppViewer::cleanup()
|
|||
// shut down mesh streamer
|
||||
gMeshRepo.shutdown();
|
||||
|
||||
// shut down Havok
|
||||
LLPhysicsExtensions::quitSystem();
|
||||
|
||||
// Must clean up texture references before viewer window is destroyed.
|
||||
if(LLHUDManager::instanceExists())
|
||||
{
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,151 +1,151 @@
|
|||
/**
|
||||
* @file llfloaterpathfindingconsole.h
|
||||
* @author William Todd Stinson
|
||||
* @brief "Pathfinding console" floater, allowing manipulation of the Havok AI pathfinding settings.
|
||||
*
|
||||
* $LicenseInfo:firstyear=2002&license=viewerlgpl$
|
||||
* Second Life Viewer Source Code
|
||||
* Copyright (C) 2010, Linden Research, Inc.
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU Lesser General Public
|
||||
* License as published by the Free Software Foundation;
|
||||
* version 2.1 of the License only.
|
||||
*
|
||||
* This library is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
* Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public
|
||||
* License along with this library; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*
|
||||
* Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
|
||||
* $/LicenseInfo$
|
||||
*/
|
||||
|
||||
#ifndef LL_LLFLOATERPATHFINDINGCONSOLE_H
|
||||
#define LL_LLFLOATERPATHFINDINGCONSOLE_H
|
||||
|
||||
#include "llfloater.h"
|
||||
#include "llnavmeshstation.h"
|
||||
#include "llphysicsextensions.h"
|
||||
#include "llcheckboxctrl.h"
|
||||
|
||||
class LLSD;
|
||||
class LLRadioGroup;
|
||||
class LLSliderCtrl;
|
||||
class LLLineEditor;
|
||||
class LLTextBase;
|
||||
|
||||
class LLFloaterPathfindingConsole
|
||||
: public LLFloater
|
||||
{
|
||||
friend class LLFloaterReg;
|
||||
|
||||
public:
|
||||
typedef enum
|
||||
{
|
||||
kRenderOverlayOnFixedPhysicsGeometry = 0,
|
||||
kRenderOverlayOnAllRenderableGeometry = 1
|
||||
} ERegionOverlayDisplay;
|
||||
|
||||
typedef enum
|
||||
{
|
||||
kPathSelectNone = 0,
|
||||
kPathSelectStartPoint = 1,
|
||||
kPathSelectEndPoint = 2
|
||||
} EPathSelectionState;
|
||||
|
||||
typedef enum
|
||||
{
|
||||
kCharacterTypeA = 0,
|
||||
kCharacterTypeB = 1,
|
||||
kCharacterTypeC = 2,
|
||||
kCharacterTypeD = 3
|
||||
} ECharacterType;
|
||||
|
||||
virtual BOOL postBuild();
|
||||
//Accessor to determine whether renderables are allowed
|
||||
BOOL allowAllRenderables() const;
|
||||
//Populates a data packet that is forwarded onto the LLPathingSystem
|
||||
void providePathingData( const LLVector3& point1, const LLVector3& point2 );
|
||||
|
||||
ERegionOverlayDisplay getRegionOverlayDisplay() const;
|
||||
void setRegionOverlayDisplay(ERegionOverlayDisplay pRegionOverlayDisplay);
|
||||
|
||||
EPathSelectionState getPathSelectionState() const;
|
||||
void setPathSelectionState(EPathSelectionState pPathSelectionState);
|
||||
|
||||
F32 getCharacterWidth() const;
|
||||
void setCharacterWidth(F32 pCharacterWidth);
|
||||
|
||||
ECharacterType getCharacterType() const;
|
||||
void setCharacterType(ECharacterType pCharacterType);
|
||||
|
||||
F32 getTerrainMaterialA() const;
|
||||
void setTerrainMaterialA(F32 pTerrainMaterial);
|
||||
|
||||
F32 getTerrainMaterialB() const;
|
||||
void setTerrainMaterialB(F32 pTerrainMaterial);
|
||||
|
||||
F32 getTerrainMaterialC() const;
|
||||
void setTerrainMaterialC(F32 pTerrainMaterial);
|
||||
|
||||
F32 getTerrainMaterialD() const;
|
||||
void setTerrainMaterialD(F32 pTerrainMaterial);
|
||||
|
||||
BOOL getShowPathToggle() const {return mShowPathCheckBox->get(); }
|
||||
|
||||
void setHasNavMeshReceived();
|
||||
void setHasNoNavMesh();
|
||||
|
||||
protected:
|
||||
|
||||
private:
|
||||
// Does its own instance management, so clients not allowed
|
||||
// to allocate or destroy.
|
||||
LLFloaterPathfindingConsole(const LLSD& pSeed);
|
||||
virtual ~LLFloaterPathfindingConsole();
|
||||
|
||||
virtual void onOpen(const LLSD& pKey);
|
||||
|
||||
void onShowNavMeshToggle();
|
||||
void onShowExcludeVolumesToggle();
|
||||
void onShowPathToggle();
|
||||
void onShowWaterPlaneToggle();
|
||||
void onRegionOverlayDisplaySwitch();
|
||||
void onPathSelectionSwitch();
|
||||
void onCharacterWidthSet();
|
||||
void onCharacterTypeSwitch();
|
||||
void onViewEditLinksetClicked();
|
||||
void onRebuildNavMeshClicked();
|
||||
void onRefreshNavMeshClicked();
|
||||
void onTerrainMaterialASet();
|
||||
void onTerrainMaterialBSet();
|
||||
void onTerrainMaterialCSet();
|
||||
void onTerrainMaterialDSet();
|
||||
|
||||
LLCheckBoxCtrl *mShowNavMeshCheckBox;
|
||||
LLCheckBoxCtrl *mShowExcludeVolumesCheckBox;
|
||||
LLCheckBoxCtrl *mShowPathCheckBox;
|
||||
LLCheckBoxCtrl *mShowWaterPlaneCheckBox;
|
||||
LLRadioGroup *mRegionOverlayDisplayRadioGroup;
|
||||
LLRadioGroup *mPathSelectionRadioGroup;
|
||||
LLSliderCtrl *mCharacterWidthSlider;
|
||||
LLRadioGroup *mCharacterTypeRadioGroup;
|
||||
LLTextBase *mPathfindingStatus;
|
||||
LLLineEditor *mTerrainMaterialA;
|
||||
LLLineEditor *mTerrainMaterialB;
|
||||
LLLineEditor *mTerrainMaterialC;
|
||||
LLLineEditor *mTerrainMaterialD;
|
||||
|
||||
LLNavMeshDownloadObserver mNavMeshDownloadObserver[10];
|
||||
int mCurrentMDO;
|
||||
|
||||
//Container that is populated and subsequently submitted to the LLPathingSystem for processing
|
||||
LLPathingLib::PathingPacket mPathData;
|
||||
};
|
||||
|
||||
#endif // LL_LLFLOATERPATHFINDINGCONSOLE_H
|
||||
/**
|
||||
* @file llfloaterpathfindingconsole.h
|
||||
* @author William Todd Stinson
|
||||
* @brief "Pathfinding console" floater, allowing manipulation of the Havok AI pathfinding settings.
|
||||
*
|
||||
* $LicenseInfo:firstyear=2002&license=viewerlgpl$
|
||||
* Second Life Viewer Source Code
|
||||
* Copyright (C) 2010, Linden Research, Inc.
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU Lesser General Public
|
||||
* License as published by the Free Software Foundation;
|
||||
* version 2.1 of the License only.
|
||||
*
|
||||
* This library is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
* Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public
|
||||
* License along with this library; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*
|
||||
* Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
|
||||
* $/LicenseInfo$
|
||||
*/
|
||||
|
||||
#ifndef LL_LLFLOATERPATHFINDINGCONSOLE_H
|
||||
#define LL_LLFLOATERPATHFINDINGCONSOLE_H
|
||||
|
||||
#include "llfloater.h"
|
||||
#include "llnavmeshstation.h"
|
||||
#include "LLPathingLib.h"
|
||||
#include "llcheckboxctrl.h"
|
||||
|
||||
class LLSD;
|
||||
class LLRadioGroup;
|
||||
class LLSliderCtrl;
|
||||
class LLLineEditor;
|
||||
class LLTextBase;
|
||||
|
||||
class LLFloaterPathfindingConsole
|
||||
: public LLFloater
|
||||
{
|
||||
friend class LLFloaterReg;
|
||||
|
||||
public:
|
||||
typedef enum
|
||||
{
|
||||
kRenderOverlayOnFixedPhysicsGeometry = 0,
|
||||
kRenderOverlayOnAllRenderableGeometry = 1
|
||||
} ERegionOverlayDisplay;
|
||||
|
||||
typedef enum
|
||||
{
|
||||
kPathSelectNone = 0,
|
||||
kPathSelectStartPoint = 1,
|
||||
kPathSelectEndPoint = 2
|
||||
} EPathSelectionState;
|
||||
|
||||
typedef enum
|
||||
{
|
||||
kCharacterTypeA = 0,
|
||||
kCharacterTypeB = 1,
|
||||
kCharacterTypeC = 2,
|
||||
kCharacterTypeD = 3
|
||||
} ECharacterType;
|
||||
|
||||
virtual BOOL postBuild();
|
||||
//Accessor to determine whether renderables are allowed
|
||||
BOOL allowAllRenderables() const;
|
||||
//Populates a data packet that is forwarded onto the LLPathingSystem
|
||||
void providePathingData( const LLVector3& point1, const LLVector3& point2 );
|
||||
|
||||
ERegionOverlayDisplay getRegionOverlayDisplay() const;
|
||||
void setRegionOverlayDisplay(ERegionOverlayDisplay pRegionOverlayDisplay);
|
||||
|
||||
EPathSelectionState getPathSelectionState() const;
|
||||
void setPathSelectionState(EPathSelectionState pPathSelectionState);
|
||||
|
||||
F32 getCharacterWidth() const;
|
||||
void setCharacterWidth(F32 pCharacterWidth);
|
||||
|
||||
ECharacterType getCharacterType() const;
|
||||
void setCharacterType(ECharacterType pCharacterType);
|
||||
|
||||
F32 getTerrainMaterialA() const;
|
||||
void setTerrainMaterialA(F32 pTerrainMaterial);
|
||||
|
||||
F32 getTerrainMaterialB() const;
|
||||
void setTerrainMaterialB(F32 pTerrainMaterial);
|
||||
|
||||
F32 getTerrainMaterialC() const;
|
||||
void setTerrainMaterialC(F32 pTerrainMaterial);
|
||||
|
||||
F32 getTerrainMaterialD() const;
|
||||
void setTerrainMaterialD(F32 pTerrainMaterial);
|
||||
|
||||
BOOL getShowPathToggle() const {return mShowPathCheckBox->get(); }
|
||||
|
||||
void setHasNavMeshReceived();
|
||||
void setHasNoNavMesh();
|
||||
|
||||
protected:
|
||||
|
||||
private:
|
||||
// Does its own instance management, so clients not allowed
|
||||
// to allocate or destroy.
|
||||
LLFloaterPathfindingConsole(const LLSD& pSeed);
|
||||
virtual ~LLFloaterPathfindingConsole();
|
||||
|
||||
virtual void onOpen(const LLSD& pKey);
|
||||
|
||||
void onShowNavMeshToggle();
|
||||
void onShowExcludeVolumesToggle();
|
||||
void onShowPathToggle();
|
||||
void onShowWaterPlaneToggle();
|
||||
void onRegionOverlayDisplaySwitch();
|
||||
void onPathSelectionSwitch();
|
||||
void onCharacterWidthSet();
|
||||
void onCharacterTypeSwitch();
|
||||
void onViewEditLinksetClicked();
|
||||
void onRebuildNavMeshClicked();
|
||||
void onRefreshNavMeshClicked();
|
||||
void onTerrainMaterialASet();
|
||||
void onTerrainMaterialBSet();
|
||||
void onTerrainMaterialCSet();
|
||||
void onTerrainMaterialDSet();
|
||||
|
||||
LLCheckBoxCtrl *mShowNavMeshCheckBox;
|
||||
LLCheckBoxCtrl *mShowExcludeVolumesCheckBox;
|
||||
LLCheckBoxCtrl *mShowPathCheckBox;
|
||||
LLCheckBoxCtrl *mShowWaterPlaneCheckBox;
|
||||
LLRadioGroup *mRegionOverlayDisplayRadioGroup;
|
||||
LLRadioGroup *mPathSelectionRadioGroup;
|
||||
LLSliderCtrl *mCharacterWidthSlider;
|
||||
LLRadioGroup *mCharacterTypeRadioGroup;
|
||||
LLTextBase *mPathfindingStatus;
|
||||
LLLineEditor *mTerrainMaterialA;
|
||||
LLLineEditor *mTerrainMaterialB;
|
||||
LLLineEditor *mTerrainMaterialC;
|
||||
LLLineEditor *mTerrainMaterialD;
|
||||
|
||||
LLNavMeshDownloadObserver mNavMeshDownloadObserver[10];
|
||||
int mCurrentMDO;
|
||||
|
||||
//Container that is populated and subsequently submitted to the LLPathingSystem for processing
|
||||
LLPathingLib::PathingPacket mPathData;
|
||||
};
|
||||
|
||||
#endif // LL_LLFLOATERPATHFINDINGCONSOLE_H
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@
|
|||
#include "llviewerprecompiledheaders.h"
|
||||
#include "llnavmeshstation.h"
|
||||
#include "llcurl.h"
|
||||
#include "llphysicsextensions.h"
|
||||
#include "LLPathingLib.h"
|
||||
#include "llagent.h"
|
||||
#include "llviewerregion.h"
|
||||
#include "llsdutil.h"
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue