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

Catching up with Lindies part 1

Browse Source
This commit is contained in:
Siana Gearz
2012-03-25 04:36:17 +02:00
parent 2e5ea4f5a7
commit 459751f206
9 changed files with 17 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llrender/llrender.cpp
View File

@@ -1440,8 +1440,6 @@ void LLRender::loadIdentity()
flush();
{
llassert_always(mMatrixMode < NUM_MATRIX_MODES) ;
mMatrix[mMatrixMode][mMatIdx[mMatrixMode]].make_identity();
mMatHash[mMatrixMode]++;
}

4
indra/llrender/llvertexbuffer.h
View File

@@ -62,7 +62,7 @@ public:
{}
const U32 mUsage;
U32 mType;
const U32 mType;
//size MUST be a power of 2
volatile U8* allocate(U32& name, U32 size);
@@ -269,8 +269,6 @@ public:
//for debugging, validate data in given range is valid
void validateRange(U32 start, U32 end, U32 count, U32 offset) const;
protected:
S32 mNumVerts; // Number of vertices allocated
S32 mNumIndices; // Number of indices allocated

2
indra/newview/llfloatermodelpreview.cpp
View File

@@ -3951,7 +3951,7 @@ void LLModelPreview::genLODs(S32 which_lod, U32 decimation, bool enforce_tri_lim
U32 num_indices = mVertexBuffer[5][mdl][i]->getNumIndices();
if (num_indices > 2)
{
glodInsertElements(mObject[mdl], i, GL_TRIANGLES, num_indices, GL_UNSIGNED_SHORT, mVertexBuffer[5][mdl][i]->getIndicesPointer(), 0, 0.f);
glodInsertElements(mObject[mdl], i, GL_TRIANGLES, num_indices, GL_UNSIGNED_SHORT, (U8*) mVertexBuffer[5][mdl][i]->getIndicesPointer(), 0, 0.f);
}
tri_count += num_indices/3;
stop_gloderror();

4
indra/newview/llfloaterwindlight.cpp
View File

@@ -147,8 +147,8 @@ void LLFloaterWindLight::initCallbacks(void) {
childSetCommitCallback("WLBlueHorizonI", onColorControlIMoved, &param_mgr->mBlueHorizon);
// haze density, horizon, mult, and altitude
childSetCommitCallback("WLHazeDensity", onColorControlRMoved, &param_mgr->mHazeDensity);
childSetCommitCallback("WLHazeHorizon", onColorControlRMoved, &param_mgr->mHazeHorizon);
childSetCommitCallback("WLHazeDensity", onFloatControlMoved, &param_mgr->mHazeDensity);
childSetCommitCallback("WLHazeHorizon", onFloatControlMoved, &param_mgr->mHazeHorizon);
childSetCommitCallback("WLDensityMult", onFloatControlMoved, &param_mgr->mDensityMult);
childSetCommitCallback("WLMaxAltitude", onFloatControlMoved, &param_mgr->mMaxAlt);

18
indra/newview/llviewermessage.cpp
View File

@@ -5785,6 +5785,16 @@ bool script_question_cb(const LLSD& notification, const LLSD& response)
S32 orig = notification["payload"]["questions"].asInteger();
S32 new_questions = orig;
if (response["Details"])
{
// respawn notification...
LLNotificationsUtil::add(notification["name"], notification["substitutions"], notification["payload"]);
// ...with description on top
LLNotificationsUtil::add("DebitPermissionDetails");
return false;
}
// check whether permissions were granted or denied
BOOL allowed = TRUE;
// the "yes/accept" button is the first button in the template, making it button 0
@@ -5841,14 +5851,6 @@ bool script_question_cb(const LLSD& notification, const LLSD& response)
gNotifyBoxView->purgeMessagesMatching(OfferMatcher(item_id));
}
if (response["Details"])
{
// respawn notification...
LLNotifications::instance().add(notification["name"], notification["substitutions"], notification["payload"]);
// ...with description on top
LLNotificationsUtil::add("DebitPermissionDetails");
}
return false;
}
static LLNotificationFunctorRegistration script_question_cb_reg_1("ScriptQuestion", script_question_cb);

2
indra/newview/llviewershadermgr.cpp
View File

@@ -588,7 +588,7 @@ BOOL LLViewerShaderMgr::loadBasicShaders()
vector< pair<string, S32> > shaders;
shaders.push_back( make_pair( "windlight/atmosphericsVarsV.glsl", mVertexShaderLevel[SHADER_WINDLIGHT] ) );
shaders.push_back( make_pair( "windlight/atmosphericsVarsWaterV.glsl", mVertexShaderLevel[SHADER_WINDLIGHT] ) );
shaders.push_back( make_pair( "windlight/atmosphericsVarsWaterV.glsl", mVertexShaderLevel[SHADER_WINDLIGHT] ) );
shaders.push_back( make_pair( "windlight/atmosphericsHelpersV.glsl", mVertexShaderLevel[SHADER_WINDLIGHT] ) );
shaders.push_back( make_pair( "lighting/lightFuncV.glsl", mVertexShaderLevel[SHADER_LIGHTING] ) );
shaders.push_back( make_pair( "lighting/sumLightsV.glsl", sum_lights_class ) );

1
indra/newview/llwlparammanager.cpp
View File

@@ -83,7 +83,6 @@
LLWLParamManager::LLWLParamManager() :
//set the defaults for the controls
// index is from sWLUniforms in pipeline.cpp line 979
/// Sun Delta Terrain tweak variables.
mSunDeltaYaw(180.0f),

34
indra/newview/llwlparamset.cpp
View File

@@ -47,33 +47,7 @@
LLWLParamSet::LLWLParamSet(void) :
mName("Unnamed Preset"),
mCloudScrollXOffset(0.f), mCloudScrollYOffset(0.f)
{
/* REMOVE or init the LLSD
const std::map<std::string, LLVector4>::value_type hardcodedPreset[] = {
std::make_pair("lightnorm", LLVector4(0.f, 0.707f, -0.707f, 0.f)),
std::make_pair("sunlight_color", LLVector4(0.6f, 0.6f, 2.83f, 2.27f)),
std::make_pair("ambient", LLVector4(0.27f, 0.33f, 0.44f, 1.19f)),
std::make_pair("blue_horizon", LLVector4(0.3f, 0.4f, 0.9f, 1.f)),
std::make_pair("blue_density", LLVector4(0.3f, 0.4f, 0.8f, 1.f)),
std::make_pair("haze_horizon", LLVector4(0.6f, 0.6f, 0.6f, 1.f)),
std::make_pair("haze_density", LLVector4(0.3f, 0.3f, 0.3f, 1.f)),
std::make_pair("cloud_shadow", LLVector4(0.f, 0.f, 0.f, 0.f)),
std::make_pair("density_multiplier", LLVector4(0.001f, 0.001f, 0.001f, 0.001f)),
std::make_pair("distance_multiplier", LLVector4(1.f, 1.f, 1.f, 1.f)),
std::make_pair("max_y", LLVector4(600.f, 600.f, 600.f, 0.f)),
std::make_pair("glow", LLVector4(15.f, 0.001f, -0.03125f, 0.f)),
std::make_pair("cloud_color", LLVector4(0.0f, 0.0f, 0.0f, 0.0f)),
std::make_pair("cloud_pos_density1", LLVector4(0.f, 0.f, 0.f, 1.f)),
std::make_pair("cloud_pos_density2", LLVector4(0.f, 0.f, 0.f, 1.f)),
std::make_pair("cloud_scale", LLVector4(0.42f, 0.f, 0.f, 1.f)),
std::make_pair("gamma", LLVector4(2.0f, 2.0f, 2.0f, 0.0f)),
};
std::map<std::string, LLVector4>::value_type const * endHardcodedPreset =
hardcodedPreset + LL_ARRAY_SIZE(hardcodedPreset);
mParamValues.insert(hardcodedPreset, endHardcodedPreset);
*/
}
{}
static LLFastTimer::DeclareTimer FTM_WL_PARAM_UPDATE("WL Param Update");
@@ -224,7 +198,6 @@ void LLWLParamSet::set(const std::string& paramName, const LLColor4 & val)
LLVector4 LLWLParamSet::getVector(const std::string& paramName, bool& error)
{
// test to see if right type
LLSD cur_val = mParamValues.get(paramName);
if (!cur_val.isArray())
@@ -245,7 +218,6 @@ LLVector4 LLWLParamSet::getVector(const std::string& paramName, bool& error)
F32 LLWLParamSet::getFloat(const std::string& paramName, bool& error)
{
// test to see if right type
LLSD cur_val = mParamValues.get(paramName);
if (cur_val.isArray() && cur_val.size() != 0)
@@ -264,8 +236,6 @@ F32 LLWLParamSet::getFloat(const std::string& paramName, bool& error)
return 0;
}
void LLWLParamSet::setSunAngle(float val)
{
// keep range 0 - 2pi
@@ -293,7 +263,6 @@ void LLWLParamSet::setEastAngle(float val)
mParamValues["east_angle"] = val;
}
void LLWLParamSet::mix(LLWLParamSet& src, LLWLParamSet& dest, F32 weight)
{
// set up the iterators
@@ -312,7 +281,6 @@ void LLWLParamSet::mix(LLWLParamSet& src, LLWLParamSet& dest, F32 weight)
// Iterate through values
for(LLSD::map_iterator iter = mParamValues.beginMap(); iter != mParamValues.endMap(); ++iter)
{
// If param exists in both src and dest, set the holder variables, otherwise skip
if(src.mParamValues.has(iter->first) && dest.mParamValues.has(iter->first))
{

2
indra/newview/llwlparamset.h
View File

@@ -117,7 +117,7 @@ public:
/// \param error A flag to set if it's not the proper return type
LLVector4 getVector(const std::string& paramName, bool& error);
/// Get an integer parameter
/// Get a float parameter
/// \param paramName The name of the parameter to set.
/// \param error A flag to set if it's not the proper return type
F32 getFloat(const std::string& paramName, bool& error);