Revision: 8943
http://playerstage.svn.sourceforge.net/playerstage/?rev=8943&view=rev
Author: natepak
Date: 2010-10-14 01:34:13 +0000 (Thu, 14 Oct 2010)
Log Message:
-----------
Removed the gui directory
Modified Paths:
--------------
code/gazebo/trunk/server/physics/Geom.cc
code/gazebo/trunk/server/rendering/OgreVisual.cc
Removed Paths:
-------------
code/gazebo/trunk/server/gui/
Modified: code/gazebo/trunk/server/physics/Geom.cc
===================================================================
--- code/gazebo/trunk/server/physics/Geom.cc 2010-10-14 01:32:14 UTC (rev
8942)
+++ code/gazebo/trunk/server/physics/Geom.cc 2010-10-14 01:34:13 UTC (rev
8943)
@@ -195,11 +195,6 @@
childNode = childNode->GetNext("visual");
}
-
- if (this->GetShapeType() != "plane" && this->GetShapeType() != "heightmap")
- {
- this->SetTransparent(false);
- }
}
////////////////////////////////////////////////////////////////////////////////
@@ -355,7 +350,6 @@
{
if (*iter)
{
- (*iter)->ToggleVisible();
if ((*iter)->GetTransparency() == 0.0)
(*iter)->SetTransparency(0.6);
else
Modified: code/gazebo/trunk/server/rendering/OgreVisual.cc
===================================================================
--- code/gazebo/trunk/server/rendering/OgreVisual.cc 2010-10-14 01:32:14 UTC
(rev 8942)
+++ code/gazebo/trunk/server/rendering/OgreVisual.cc 2010-10-14 01:34:13 UTC
(rev 8943)
@@ -668,7 +668,7 @@
Ogre::MovableObject *obj = this->sceneNode->getAttachedObject(i);
entity = dynamic_cast<Ogre::Entity*>(obj);
- //simple = dynamic_cast<Ogre::SimpleRenderable*>(obj);
+
if (!entity)
continue;
@@ -681,7 +681,7 @@
unsigned int techniqueCount, passCount;
Ogre::Technique *technique;
Ogre::Pass *pass;
- Ogre::ColourValue sc, dc;
+ Ogre::ColourValue dc;
for (techniqueCount = 0; techniqueCount < material->getNumTechniques();
techniqueCount++)
@@ -691,30 +691,15 @@
for (passCount=0; passCount < technique->getNumPasses(); passCount++)
{
pass = technique->getPass(passCount);
- sc = pass->getDiffuse();
+ pass->setSceneBlending(Ogre::SBT_TRANSPARENT_ALPHA);
if (this->transparency > 0.0)
pass->setDepthWriteEnabled(false);
else
pass->setDepthWriteEnabled(true);
- switch (this->sceneBlendType)
- {
- case Ogre::SBT_ADD:
- dc = sc;
- dc.r -= sc.r * this->transparency;
- dc.g -= sc.g * this->transparency;
- dc.b -= sc.b * this->transparency;
- pass->setAmbient(Ogre::ColourValue::Black);
- break;
-
- case Ogre::SBT_TRANSPARENT_ALPHA:
- default:
- dc = sc;
- dc.a = (1.0f - this->transparency);
- pass->setAmbient(pass->getAmbient());
- break;
- }
+ dc = pass->getDiffuse();
+ dc.a = (1.0f - this->transparency);
pass->setDiffuse(dc);
}
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Beautiful is writing same markup. Internet Explorer 9 supports
standards for HTML5, CSS3, SVG 1.1, ECMAScript5, and DOM L2 & L3.
Spend less time writing and rewriting code and more time creating great
experiences on the web. Be a part of the beta today.
http://p.sf.net/sfu/beautyoftheweb
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
