Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merging broke compile. Fixing and removing a few no-longer-needed global constants.

Browse Source
This commit is contained in:
Shyotl
2011-06-08 17:06:28 -05:00
parent b691e2b286
commit ec9da17ed0
2 changed files with 17 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
indra/newview/llagent.cpp
View File

@@ -111,36 +111,22 @@
using namespace LLVOAvatarDefines; using namespace LLVOAvatarDefines;
//drone wandering constants const BOOL ANIMATE = TRUE;
const F32 MAX_WANDER_TIME = 20.f; // seconds const U8 AGENT_STATE_TYPING = 0x04;
const F32 MAX_HEADING_HALF_ERROR = 0.2f; // radians const U8 AGENT_STATE_EDITING = 0x10;
const F32 WANDER_MAX_SLEW_RATE = 2.f * DEG_TO_RAD; // radians / frame
const F32 WANDER_TARGET_MIN_DISTANCE = 10.f; // meters
// Autopilot constants // Autopilot constants
const F32 AUTOPILOT_HEADING_HALF_ERROR = 10.f * DEG_TO_RAD; // radians
const F32 AUTOPILOT_MAX_SLEW_RATE = 1.f * DEG_TO_RAD; // radians / frame
const F32 AUTOPILOT_STOP_DISTANCE = 2.f; // meters
const F32 AUTOPILOT_HEIGHT_ADJUST_DISTANCE = 8.f; // meters const F32 AUTOPILOT_HEIGHT_ADJUST_DISTANCE = 8.f; // meters
const F32 AUTOPILOT_MIN_TARGET_HEIGHT_OFF_GROUND = 1.f; // meters const F32 AUTOPILOT_MIN_TARGET_HEIGHT_OFF_GROUND = 1.f; // meters
const F32 AUTOPILOT_MAX_TIME_NO_PROGRESS = 1.5f; // seconds const F32 AUTOPILOT_MAX_TIME_NO_PROGRESS = 1.5f; // seconds
// face editing constants const F32 MAX_VELOCITY_AUTO_LAND_SQUARED = 4.f * 4.f;
const LLVector3d FACE_EDIT_CAMERA_OFFSET(0.4f, -0.05f, 0.07f); const F64 CHAT_AGE_FAST_RATE = 3.0;
const LLVector3d FACE_EDIT_TARGET_OFFSET(0.f, 0.f, 0.05f);
// fidget constants // fidget constants
const F32 MIN_FIDGET_TIME = 8.f; // seconds const F32 MIN_FIDGET_TIME = 8.f; // seconds
const F32 MAX_FIDGET_TIME = 20.f; // seconds const F32 MAX_FIDGET_TIME = 20.f; // seconds
const F32 MAX_VELOCITY_AUTO_LAND_SQUARED = 4.f * 4.f;
const F32 MAX_FOCUS_OFFSET = 20.f;
const F32 MIN_RADIUS_ALPHA_SIZZLE = 0.5f;
const F64 CHAT_AGE_FAST_RATE = 3.0;
// The agent instance. // The agent instance.
LLAgent gAgent; LLAgent gAgent;
@@ -256,7 +242,7 @@ LLAgent::LLAgent() :
mAutoPilotFinishedCallback(NULL), mAutoPilotFinishedCallback(NULL),
mAutoPilotCallbackData(NULL), mAutoPilotCallbackData(NULL),
mEffectColor(0.f, 1.f, 1.f, 1.f), mEffectColor(new LLColor4(0.f, 1.f, 1.f, 1.f)),
mHaveHomePosition(FALSE), mHaveHomePosition(FALSE),
mHomeRegionHandle( 0 ), mHomeRegionHandle( 0 ),
@@ -271,8 +257,7 @@ LLAgent::LLAgent() :
mPendingLure(NULL) mPendingLure(NULL)
{ {
U32 i; for (U32 i = 0; i < TOTAL_CONTROLS; i++)
for (i = 0; i < TOTAL_CONTROLS; i++)
{ {
mControlsTakenCount[i] = 0; mControlsTakenCount[i] = 0;
mControlsTakenPassedOnCount[i] = 0; mControlsTakenPassedOnCount[i] = 0;
@@ -292,7 +277,7 @@ void LLAgent::init()
// LLDebugVarMessageBox::show("Camera Lag", &CAMERA_FOCUS_HALF_LIFE, 0.5f, 0.01f); // LLDebugVarMessageBox::show("Camera Lag", &CAMERA_FOCUS_HALF_LIFE, 0.5f, 0.01f);
mEffectColor = gSavedSettings.getColor4("EffectColor"); *mEffectColor = gSavedSettings.getColor4("EffectColor");
mInitialized = TRUE; mInitialized = TRUE;
} }
@@ -318,6 +303,8 @@ LLAgent::~LLAgent()
delete mAgentAccess; delete mAgentAccess;
mAgentAccess = NULL; mAgentAccess = NULL;
delete mEffectColor;
mEffectColor = NULL;
} }
@@ -2777,12 +2764,12 @@ void LLAgent::getName(std::string& name)
const LLColor4 &LLAgent::getEffectColor() const LLColor4 &LLAgent::getEffectColor()
{ {
return mEffectColor; return *mEffectColor;
} }
void LLAgent::setEffectColor(const LLColor4 &color) void LLAgent::setEffectColor(const LLColor4 &color)
{ {
mEffectColor = color; *mEffectColor = color;
} }
void LLAgent::initOriginGlobal(const LLVector3d &origin_global) void LLAgent::initOriginGlobal(const LLVector3d &origin_global)

13
indra/newview/llagent.h
View File

@@ -45,14 +45,11 @@
#include "llvoavatardefines.h" #include "llvoavatardefines.h"
#include "llviewerinventory.h" #include "llviewerinventory.h"
#include "llinventorymodel.h" #include "llinventorymodel.h"
#include "v3dmath.h"
// Ventrella extern const BOOL ANIMATE;
#include "llfollowcam.h" extern const U8 AGENT_STATE_TYPING; // Typing indication
// end Ventrella extern const U8 AGENT_STATE_EDITING; // Set when agent has objects selected
const BOOL ANIMATE = TRUE;
const U8 AGENT_STATE_TYPING = 0x04; // Typing indication
const U8 AGENT_STATE_EDITING = 0x10; // Set when agent has objects selected
class LLChat; class LLChat;
class LLVOAvatar; class LLVOAvatar;
@@ -693,7 +690,7 @@ public:
const LLColor4 &getEffectColor(); const LLColor4 &getEffectColor();
void setEffectColor(const LLColor4 &color); void setEffectColor(const LLColor4 &color);
private: private:
LLColor4 mEffectColor; LLColor4 *mEffectColor;
/** Rendering /** Rendering
** ** ** **