Revision: 8707
http://playerstage.svn.sourceforge.net/playerstage/?rev=8707&view=rev
Author: natepak
Date: 2010-05-22 21:47:04 +0000 (Sat, 22 May 2010)
Log Message:
-----------
Removed grid drawing
Modified Paths:
--------------
code/gazebo/trunk/server/rendering/OgreAdaptor.cc
code/gazebo/trunk/server/rendering/OgreAdaptor.hh
code/gazebo/trunk/server/rendering/OgreCreator.cc
code/gazebo/trunk/server/rendering/OgreCreator.hh
Modified: code/gazebo/trunk/server/rendering/OgreAdaptor.cc
===================================================================
--- code/gazebo/trunk/server/rendering/OgreAdaptor.cc 2010-05-22 21:12:05 UTC
(rev 8706)
+++ code/gazebo/trunk/server/rendering/OgreAdaptor.cc 2010-05-22 21:47:04 UTC
(rev 8707)
@@ -75,7 +75,6 @@
Param::Begin(&this->parameters);
this->ambientP = new ParamT<Vector4>("ambient",Vector4(.1,.1,.1,.1),0);
this->shadowsP = new ParamT<bool>("shadows", true, 0);
- this->drawGridP = new ParamT<bool>("grid", true, 0);
this->skyMaterialP = new ParamT<std::string>("material","",1);
this->backgroundColorP = new
ParamT<Vector3>("backgroundColor",Vector3(0.5,0.5,0.5), 0);
@@ -96,7 +95,6 @@
delete this->ambientP;
delete this->shadowsP;
delete this->backgroundColorP;
- delete this->drawGridP;
delete this->skyMaterialP;
}
@@ -199,7 +197,6 @@
this->ambientP->Load(node);
this->shadowsP->Load(node);
this->backgroundColorP->Load(node);
- this->drawGridP->Load(node);
ambient.r = (**(this->ambientP)).x;
ambient.g = (**(this->ambientP)).y;
@@ -240,9 +237,6 @@
if (node)
OgreCreator::CreateFog(node->GetChild("fog"));
- if (**(this->drawGridP))
- OgreCreator::DrawGrid();
-
// Set up the world geometry link
if (this->sceneType==SCENE_BSP)
{
@@ -286,7 +280,6 @@
{
stream << prefix << "<rendering:ogre>\n";
stream << prefix << " " << *(this->ambientP) << "\n";
- stream << prefix << " " << *(this->drawGridP) << "\n";
if ((**this->skyMaterialP).size())
{
@@ -471,7 +464,6 @@
std::vector<OgreCamera*>::iterator iter;
OgreCreator::Instance()->Update();
-
this->root->_fireFrameStarted();
// Draw all the non-user cameras
Modified: code/gazebo/trunk/server/rendering/OgreAdaptor.hh
===================================================================
--- code/gazebo/trunk/server/rendering/OgreAdaptor.hh 2010-05-22 21:12:05 UTC
(rev 8706)
+++ code/gazebo/trunk/server/rendering/OgreAdaptor.hh 2010-05-22 21:47:04 UTC
(rev 8707)
@@ -168,7 +168,6 @@
private: ParamT<Vector4> *ambientP;
private: ParamT<bool> *shadowsP;
private: ParamT<Vector3> *backgroundColorP;
- private: ParamT<bool> *drawGridP;
private: ParamT<std::string> *skyMaterialP;
private: std::vector<Param*> parameters;
Modified: code/gazebo/trunk/server/rendering/OgreCreator.cc
===================================================================
--- code/gazebo/trunk/server/rendering/OgreCreator.cc 2010-05-22 21:12:05 UTC
(rev 8706)
+++ code/gazebo/trunk/server/rendering/OgreCreator.cc 2010-05-22 21:47:04 UTC
(rev 8707)
@@ -308,172 +308,6 @@
////////////////////////////////////////////////////////////////////////////////
-// Draw a grid on the ground
-void OgreCreator::DrawGrid()
-{
- if (!Simulator::Instance()->GetRenderEngineEnabled())
- return;
-
- Ogre::ManualObject* gridObject =
OgreAdaptor::Instance()->sceneMgr->createManualObject("__OGRE_GRID__");
-
- gridObject->setCastShadows(false);
-
- Ogre::SceneNode* gridObjectNode =
OgreAdaptor::Instance()->sceneMgr->getRootSceneNode()->createChildSceneNode("__OGRE_GRID_NODE__");
-
- Ogre::MaterialPtr gridObjectMaterialX =
Ogre::MaterialManager::getSingleton().create("__OGRE_GRID_MATERIAL_X__","General");
- gridObjectMaterialX->getTechnique(0)->setLightingEnabled(true);
- gridObjectMaterialX->getTechnique(0)->getPass(0)->setDiffuse(0.2,0.2,0.2,1);
- gridObjectMaterialX->getTechnique(0)->getPass(0)->setAmbient(0.2,0.2,0.2);
-
//gridObjectMaterialX->getTechnique(0)->getPass(0)->setSelfIllumination(0.0,0.0,0.0);
- gridObjectMaterialX->setReceiveShadows(false);
-
- Ogre::MaterialPtr gridObjectMaterialY =
Ogre::MaterialManager::getSingleton().create("__OGRE_GRID_MATERIAL_Y__","General");
- gridObjectMaterialY->getTechnique(0)->setLightingEnabled(true);
- gridObjectMaterialY->getTechnique(0)->getPass(0)->setDiffuse(0.2,0.2,0.2,1);
- gridObjectMaterialY->getTechnique(0)->getPass(0)->setAmbient(0.2,0.2,0.2);
-
//gridObjectMaterialY->getTechnique(0)->getPass(0)->setSelfIllumination(0.0,0.0,0.0);
- gridObjectMaterialY->setReceiveShadows(false);
-
-
- float d = 0.01;
- int dim = 50;
-
- // Vertex Values for a square box
- float v[8][3] =
- {
- {-1, -1, -1}, {+1, -1, -1}, {+1, +1, -1}, {-1, +1, -1},
- {-1, -1, +1}, {+1, -1, +1}, {+1, +1, +1}, {-1, +1, +1}
- };
-
- // Indices
- int ind[36] =
- {
- // Bottom Face
- 0, 1, 2,
- 2, 3, 0,
-
- // Top Face
- 4, 5, 7,
- 7, 5, 6,
-
- // Front Face
- 0, 4, 7,
- 7, 3, 0,
-
- // Back face
- 5, 1, 6,
- 6, 1, 2,
-
- // Left face
- 0, 5, 4,
- 0, 1, 5,
-
- // Right face
- 3, 7, 6,
- 6, 2, 3
-
-
- };
-
- gridObject->begin("__OGRE_GRID_MATERIAL_Y__",
Ogre::RenderOperation::OT_TRIANGLE_LIST);
-
- for (int y=-dim; y<dim; y++)
- {
- if (y%10 == 0)
- d = 0.04;
- else
- d = 0.01;
-
- // For each face
- for (int i = 0; i < 36; i++)
- {
- gridObject->position( v[ind[i]][0] * dim,
- y+v[ind[i]][1] * 0.02,
- v[ind[i]][2] * 0.01 );
- }
- char *name=new char[20];
- char *text=new char[10];
-
- sprintf(name,"(%d %d)_yaxis",0,y);
- sprintf(text,"%d",y);
-
- OgreMovableText* msg = new OgreMovableText();
- try
- {
- msg->Load(name, text,"Arial",0.08);
- }
- catch (Ogre::Exception e)
- {
- std::ostringstream stream;
- stream << "Unable to create the text. " << e.getDescription()
<<std::endl;
- gzthrow(stream.str() );
- }
- msg->SetTextAlignment(OgreMovableText::H_CENTER, OgreMovableText::V_ABOVE);
-
- Ogre::SceneNode *textNode =
OgreAdaptor::Instance()->sceneMgr->getRootSceneNode()->createChildSceneNode(std::string(name)+"_node");
-
- textNode->attachObject(msg);
- textNode->translate(0, y, 0.02);
-
- delete [] name;
- delete [] text;
-
- }
-
- gridObject->end();
-
- gridObject->begin("__OGRE_GRID_MATERIAL_X__",
Ogre::RenderOperation::OT_TRIANGLE_LIST);
-
- for (int x=-dim; x<dim; x++)
- {
- if (x%10 == 0)
- d = 0.04;
- else
- d = 0.01;
-
- // For each face
- for (int i = 0; i < 36; i++)
- {
- gridObject->position(x+v[ind[i]][0] * 0.02,
- v[ind[i]][1] * dim,
- v[ind[i]][2] * 0.01 );
- }
-
- char *name=new char[20];
- char *text=new char[10];
-
- sprintf(name,"(%d %d)_xaxis",x,0);
- sprintf(text,"%d",x);
-
- OgreMovableText* msg = new OgreMovableText();
- try
- {
- msg->Load(name, text,"Arial",0.08);
- }
- catch (Ogre::Exception e)
- {
- std::ostringstream stream;
- stream << "Unable to create the text. " << e.getDescription()
<<std::endl;
- gzthrow(stream.str() );
- }
- msg->SetTextAlignment(OgreMovableText::H_CENTER, OgreMovableText::V_ABOVE);
-
- Ogre::SceneNode *textNode =
OgreAdaptor::Instance()->sceneMgr->getRootSceneNode()->createChildSceneNode(std::string(name)+"_node");
-
- textNode->attachObject(msg);
- textNode->translate(x, 0, 0.02);
-
- delete [] name;
- delete [] text;
- }
-
- // etc
- gridObject->end();
- gridObjectNode->attachObject(gridObject);
-
-}
-
-////////////////////////////////////////////////////////////////////////////////
/// Draw a named line
void OgreCreator::DrawLine(const Vector3 &start, const Vector3 &end,
const std::string &name)
@@ -733,10 +567,9 @@
(*titer)->Update();
// Update the lines
- for (iter = this->lines.begin(); iter != this->lines.end(); iter++)
- (*iter)->Update();
+ //for (iter = this->lines.begin(); iter != this->lines.end(); iter++)
+ //(*iter)->Update();
-
// We only need this loop because we are using threads. The physics engine
// can't reliably set the pose of the visuals when it's running in a
// separate thread.
Modified: code/gazebo/trunk/server/rendering/OgreCreator.hh
===================================================================
--- code/gazebo/trunk/server/rendering/OgreCreator.hh 2010-05-22 21:12:05 UTC
(rev 8706)
+++ code/gazebo/trunk/server/rendering/OgreCreator.hh 2010-05-22 21:47:04 UTC
(rev 8707)
@@ -116,9 +116,6 @@
/// \brief Insert a mesh into Ogre
public: static void InsertMesh( const Mesh *mesh);
- /// \brief Draw the uniform grid pattern
- public: static void DrawGrid();
-
/// \brief Draw a named line
public: static void DrawLine(const Vector3 &start, const Vector3 &end,
const std::string &name);
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
