1
0
Fork 0

Remove building density slider. Values > 1.0 have massive memory

impacts and can result in FG paging to disk continually and hanging
some systems, with no obvious cause or fix (particularly with auto-save).

For the moment we simply remove the slider, allowing power users to
modify the density in preferences.xml.

Once the memory consumption of buildings has been addressed we should
be able to put the slide back in.
This commit is contained in:
Stuart Buchanan 2012-07-19 21:36:06 +01:00
parent 05e3eb80f4
commit e91620a456

View file

@ -247,6 +247,19 @@
<row>2</row> <row>2</row>
<col>0</col> <col>0</col>
<halign>left</halign> <halign>left</halign>
<label>Random buildings</label>
<name>random-buildings</name>
<property>/sim/rendering/random-buildings</property>
<binding>
<command>dialog-apply</command>
<object-name>random-buildings</object-name>
</binding>
</checkbox>
<checkbox>
<row>3</row>
<col>0</col>
<halign>left</halign>
<label>Random objects</label> <label>Random objects</label>
<name>random-objects</name> <name>random-objects</name>
<property>/sim/rendering/random-objects</property> <property>/sim/rendering/random-objects</property>
@ -257,7 +270,7 @@
</checkbox> </checkbox>
<checkbox> <checkbox>
<row>3</row> <row>4</row>
<col>0</col> <col>0</col>
<halign>left</halign> <halign>left</halign>
<label>Random vegetation</label> <label>Random vegetation</label>
@ -269,7 +282,7 @@
</binding> </binding>
</checkbox> </checkbox>
<text> <text>
<row>3</row> <row>4</row>
<col>1</col> <col>1</col>
<label>density</label> <label>density</label>
<enable> <enable>
@ -277,7 +290,7 @@
</enable> </enable>
</text> </text>
<slider> <slider>
<row>3</row> <row>4</row>
<col>2</col> <col>2</col>
<name>vegetation-density</name> <name>vegetation-density</name>
<min>0</min> <min>0</min>
@ -290,7 +303,7 @@
</binding> </binding>
</slider> </slider>
<text> <text>
<row>3</row> <row>4</row>
<col>3</col> <col>3</col>
<label>12345678</label> <label>12345678</label>
<format>%.1f</format> <format>%.1f</format>
@ -301,50 +314,6 @@
</enable> </enable>
</text> </text>
<checkbox>
<row>4</row>
<col>0</col>
<halign>left</halign>
<label>Random buildings</label>
<name>random-buildings</name>
<property>/sim/rendering/random-buildings</property>
<binding>
<command>dialog-apply</command>
<object-name>random-buildings</object-name>
</binding>
</checkbox>
<text>
<row>4</row>
<col>1</col>
<label>density</label>
<enable>
<property>/sim/rendering/random-buildings</property>
</enable>
</text>
<slider>
<row>4</row>
<col>2</col>
<name>building-density</name>
<min>0</min>
<max>5.0</max>
<step>0.1</step>
<property>/sim/rendering/building-density</property>
<binding>
<command>dialog-apply</command>
<object-name>building-density</object-name>
</binding>
</slider>
<text>
<row>4</row>
<col>3</col>
<label>12345678</label>
<format>%.1f</format>
<live>true</live>
<property>/sim/rendering/building-density</property>
<enable>
<property>/sim/rendering/random-buildings</property>
</enable>
</text>
</group> </group>
<button> <button>