1
0
Fork 0

Fix black border on trees.

- Add additional property checks for multisampling.
- Add transparent background with appropriate color for each tree
- Add conversion script to generate .dds and low rez trees easily.
This commit is contained in:
Stuart Buchanan 2013-05-16 22:40:36 +01:00
parent 5ed97555db
commit 1b8c05b162
11 changed files with 15 additions and 13 deletions

View file

@ -41,20 +41,17 @@
<and> <and>
<property>/sim/rendering/shaders/skydome</property> <property>/sim/rendering/shaders/skydome</property>
<property>/sim/rendering/random-vegetation</property> <property>/sim/rendering/random-vegetation</property>
<or> <property>/sim/rendering/multi-sample-buffers</property>
<less-equal> <less-equal>
<value type="float">2.0</value> <value type="float">1.0</value>
<glversion/> <float-property>/sim/rendering/multi-samples</float-property>
</less-equal> </less-equal>
<and>
<extension-supported>GL_ARB_shader_objects</extension-supported> <extension-supported>GL_ARB_shader_objects</extension-supported>
<extension-supported>GL_ARB_shading_language_100</extension-supported> <extension-supported>GL_ARB_shading_language_100</extension-supported>
<extension-supported>GL_ARB_vertex_shader</extension-supported> <extension-supported>GL_ARB_vertex_shader</extension-supported>
<extension-supported>GL_ARB_fragment_shader</extension-supported> <extension-supported>GL_ARB_fragment_shader</extension-supported>
<extension-supported>GL_ARB_multisample</extension-supported> <extension-supported>GL_ARB_multisample</extension-supported>
</and> </and>
</or>
</and>
</predicate> </predicate>
<pass> <pass>
@ -328,6 +325,11 @@
<predicate> <predicate>
<and> <and>
<property>/sim/rendering/random-vegetation</property> <property>/sim/rendering/random-vegetation</property>
<property>/sim/rendering/multi-sample-buffers</property>
<less-equal>
<value type="float">1.0</value>
<float-property>/sim/rendering/multi-samples</float-property>
</less-equal>
<extension-supported>GL_ARB_multisample</extension-supported> <extension-supported>GL_ARB_multisample</extension-supported>
<extension-supported>GL_ARB_vertex_shader</extension-supported> <extension-supported>GL_ARB_vertex_shader</extension-supported>
<extension-supported>GL_ARB_fragment_shader</extension-supported> <extension-supported>GL_ARB_fragment_shader</extension-supported>

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 50 KiB

After

Width:  |  Height:  |  Size: 54 KiB

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 65 KiB

After

Width:  |  Height:  |  Size: 63 KiB

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 80 KiB

After

Width:  |  Height:  |  Size: 87 KiB

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 75 KiB

After

Width:  |  Height:  |  Size: 81 KiB

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 26 KiB

After

Width:  |  Height:  |  Size: 27 KiB