# Fixed rendering of transparent objects.
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:
parent
41bec4a181
commit
44be62092c
@ -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>
|
||||
|
@ -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>
|
||||
|
@ -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>
|
||||
|
@ -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>
|
||||
|
@ -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>
|
||||
|
@ -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>
|
||||
|
@ -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>
|
||||
|
@ -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>
|
||||
|
@ -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;
|
||||
|
@ -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);
|
||||
}
|
||||
};
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user