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

Added a terrain texture scale changer thing!

Browse Source 
Need someone to add UI bits though >.<
This commit is contained in:
Drake Arconis
2012-07-14 05:04:10 -04:00
parent 340f8f1f17
commit 07e1f0e802
4 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
indra/newview/featuretable.txt
View File

@@ -42,6 +42,7 @@ RenderObjectBump 1 1
RenderLocalLights 1 1
RenderReflectionDetail 1 4
RenderTerrainDetail 1 1
RenderTerrainScale 1 12.0
RenderTerrainLODFactor 1 2.0
RenderTransparentWater 1 1
RenderTreeLODFactor 1 1.0
@@ -86,6 +87,7 @@ RenderObjectBump 1 0
RenderLocalLights 1 0
RenderReflectionDetail 1 0
RenderTerrainDetail 1 0
RenderTerrainScale 1 12.0
RenderTerrainLODFactor 1 1
RenderTransparentWater 1 0
RenderTreeLODFactor 1 0
@@ -117,6 +119,7 @@ RenderObjectBump 1 1
RenderLocalLights 1 1
RenderReflectionDetail 1 0
RenderTerrainDetail 1 1
RenderTerrainScale 1 9.0
RenderTerrainLODFactor 1 1.0
RenderTransparentWater 1 1
RenderTreeLODFactor 1 0.5
@@ -149,6 +152,7 @@ RenderObjectBump 1 1
RenderLocalLights 1 1
RenderReflectionDetail 1 2
RenderTerrainDetail 1 1
RenderTerrainScale 1 6.0
RenderTerrainLODFactor 1 2.0
RenderTransparentWater 1 1
RenderTreeLODFactor 1 0.5
@@ -179,6 +183,7 @@ RenderObjectBump 1 1
RenderLocalLights 1 1
RenderReflectionDetail 1 4
RenderTerrainDetail 1 1
RenderTerrainScale 1 5.0
RenderTerrainLODFactor 1 2.0
RenderTransparentWater 1 1
RenderTreeLODFactor 1 1.0

6
indra/newview/featuretable_linux.txt
View File

@@ -42,6 +42,7 @@ RenderMaxPartCount 1 8192
RenderObjectBump 1 1
RenderReflectionDetail 1 4
RenderTerrainDetail 1 1
RenderTerrainScale 1 12.0
RenderTerrainLODFactor 1 2.0
RenderTransparentWater 1 1
RenderTreeLODFactor 1 1.0
@@ -83,6 +84,7 @@ RenderMaxPartCount 1 512
RenderObjectBump 1 0
RenderReflectionDetail 1 0
RenderTerrainDetail 1 0
RenderTerrainScale 1 12.0
RenderTerrainLODFactor 1 1
RenderTransparentWater 1 0
RenderTreeLODFactor 1 0
@@ -114,6 +116,7 @@ RenderMaxPartCount 1 2048
RenderObjectBump 1 1
RenderReflectionDetail 1 0
RenderTerrainDetail 1 1
RenderTerrainScale 1 9.0
RenderTerrainLODFactor 1 1.0
RenderTransparentWater 1 1
RenderTreeLODFactor 1 0.5
@@ -144,6 +147,7 @@ RenderLocalLights 1 1
RenderMaxPartCount 1 4096
RenderObjectBump 1 1
RenderReflectionDetail 1 2
RenderTerrainScale 1 6.0
RenderTerrainDetail 1 1
RenderTerrainLODFactor 1 2.0
RenderTransparentWater 1 1
@@ -177,6 +181,7 @@ RenderMaxPartCount 1 8192
RenderObjectBump 1 1
RenderReflectionDetail 1 4
RenderTerrainDetail 1 1
RenderTerrainScale 1 5.0
RenderTerrainLODFactor 1 2.0
RenderTransparentWater 1 1
RenderTreeLODFactor 1 1.0
@@ -266,6 +271,7 @@ RenderAvatarVP 0 0
RenderObjectBump 0 0
RenderMaxPartCount 1 1024
RenderTerrainDetail 1 0
RenderTerrainScale 1 12.0
RenderUseImpostors 0 0
RenderVBOEnable 1 0
RenderReflectionDetail 0 0

5
indra/newview/featuretable_mac.txt
View File

@@ -42,6 +42,7 @@ RenderMaxPartCount 1 8192
RenderObjectBump 1 1
RenderReflectionDetail 1 4
RenderTerrainDetail 1 1
RenderTerrainScale 1 12.0
RenderTerrainLODFactor 1 2.0
RenderTransparentWater 1 1
RenderTreeLODFactor 1 1.0
@@ -86,6 +87,7 @@ RenderMaxPartCount 1 512
RenderObjectBump 1 0
RenderReflectionDetail 1 0
RenderTerrainDetail 1 0
RenderTerrainScale 1 12.0
RenderTerrainLODFactor 1 1
RenderTransparentWater 1 0
RenderTreeLODFactor 1 0
@@ -117,6 +119,7 @@ RenderMaxPartCount 1 2048
RenderObjectBump 1 1
RenderReflectionDetail 1 0
RenderTerrainDetail 1 1
RenderTerrainScale 1 9.0
RenderTerrainLODFactor 1 1.0
RenderTransparentWater 1 1
RenderTreeLODFactor 1 0.5
@@ -149,6 +152,7 @@ RenderMaxPartCount 1 4096
RenderObjectBump 1 1
RenderReflectionDetail 1 2
RenderTerrainDetail 1 1
RenderTerrainScale 1 6.0
RenderTerrainLODFactor 1 2.0
RenderTransparentWater 1 1
RenderTreeLODFactor 1 0.5
@@ -181,6 +185,7 @@ RenderMaxPartCount 1 8192
RenderObjectBump 1 1
RenderReflectionDetail 1 4
RenderTerrainDetail 1 1
RenderTerrainScale 1 5.0
RenderTerrainLODFactor 1 2.0
RenderTransparentWater 1 1
RenderTreeLODFactor 1 1.0

8
indra/newview/llviewercontrol.cpp
View File

@@ -122,6 +122,13 @@ static bool handleTerrainDetailChanged(const LLSD& newvalue)
return true;
}
static bool handleTerrainScaleChanged(const LLSD& inputvalue)
{
LLSD newvalue = 1.f / inputvalue.asReal();
LLDrawPoolTerrain::sDetailScale = newvalue.asReal();
return true;
}
bool handleStateMachineMaxTimeChanged(const LLSD& newvalue)
{
AIStateMachine::updateSettings();
@@ -621,6 +628,7 @@ void settings_setup_listeners()
gSavedSettings.getControl("FirstPersonAvatarVisible")->getSignal()->connect(boost::bind(&handleRenderAvatarMouselookChanged, _2));
gSavedSettings.getControl("RenderFarClip")->getSignal()->connect(boost::bind(&handleRenderFarClipChanged, _2));
gSavedSettings.getControl("RenderTerrainDetail")->getSignal()->connect(boost::bind(&handleTerrainDetailChanged, _2));
gSavedSettings.getControl("RenderTerrainScale")->getSignal()->connect(boost::bind(&handleTerrainScaleChanged, _2));
gSavedSettings.getControl("OctreeStaticObjectSizeFactor")->getSignal()->connect(boost::bind(&handleRepartition, _2));
gSavedSettings.getControl("OctreeDistanceFactor")->getSignal()->connect(boost::bind(&handleRepartition, _2));
gSavedSettings.getControl("OctreeMaxNodeCapacity")->getSignal()->connect(boost::bind(&handleRepartition, _2));