Vantha/0ad
1
1
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

# Fixed rendering of transparent objects.

Browse Source 
Made transparency ordering give consistent results if two transparent
models are in the same position.
Removed transparency material from tree trunks, so they won't suffer
from transparency-ordering issues.

This was SVN commit r4889.
This commit is contained in:
Ykkrosh 2007-02-10 18:26:57 +00:00
parent 41bec4a181
commit 44be62092c
10 changed files with 14 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
binaries/data/mods/official/art/actors/flora/trees/carob.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
@ -48,6 +48,4 @@
</variant>
</group>
<material>basic_trans.xml</material>
</actor>

4
binaries/data/mods/official/art/actors/flora/trees/european_beech.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
@ -26,6 +26,4 @@
</variant>
</group>
<material>basic_trans.xml</material>
</actor>

4
binaries/data/mods/official/art/actors/flora/trees/lumbardypoplar.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
@ -24,6 +24,4 @@
</variant>
</group>
<material>basic_trans.xml</material>
</actor>

4
binaries/data/mods/official/art/actors/flora/trees/oak.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
@ -26,6 +26,4 @@
</variant>
</group>
<material>basic_trans.xml</material>
</actor>

4
binaries/data/mods/official/art/actors/flora/trees/oak_autumn.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
@ -26,6 +26,4 @@
</variant>
</group>
<material>basic_trans.xml</material>
</actor>

4
binaries/data/mods/official/art/actors/flora/trees/oak_large.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
@ -29,6 +29,4 @@
</variant>
</group>
<material>basic_trans.xml</material>
</actor>

4
binaries/data/mods/official/art/actors/flora/trees/orchard_tree.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
@ -51,6 +51,4 @@
</variant>
</group>
<material>basic_trans.xml</material>
</actor>

4
binaries/data/mods/official/art/actors/flora/trees/poplar.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
@ -36,6 +36,4 @@
</variant>
</group>
<material>basic_trans.xml</material>
</actor>

4
source/renderer/Renderer.cpp
View File

@ -525,8 +525,8 @@ bool CRenderer::Open(int width, int height, int depth)
// Particle engine
CParticleEngine::GetInstance()->initParticleSystem();
CEmitter *pEmitter = new CDefaultEmitter(1000, -1);
CParticleEngine::GetInstance()->addEmitter(pEmitter);
// CEmitter *pEmitter = new CDefaultEmitter(1000, -1);
// CParticleEngine::GetInstance()->addEmitter(pEmitter);
// Dimensions
m_Width = width;

5
source/renderer/TransparencyRenderer.cpp
View File

@ -459,7 +459,10 @@ void SortModelRenderer::Submit(CModel* model)
// Transform and sort all models
struct SortModelsByDist {
bool operator()(SModel* lhs, SModel* rhs) {
return lhs->m_Distance > rhs->m_Distance ? true : false;
// Sort by distance, and break ties by comparing pointers
return lhs->m_Distance > rhs->m_Distance ? true
: lhs->m_Distance < rhs->m_Distance ? false
: (lhs > rhs);
}
};