Revision: 7841
http://playerstage.svn.sourceforge.net/playerstage/?rev=7841&view=rev
Author: natepak
Date: 2009-06-11 15:47:34 +0000 (Thu, 11 Jun 2009)
Log Message:
-----------
Removed ogre_path as it's not necessary
Modified Paths:
--------------
code/gazebo/trunk/Media/materials/scripts/Gazebo.material
code/gazebo/trunk/server/rendering/OgreAdaptor.cc
code/gazebo/trunk/worlds/pioneer2dx.world
code/gazebo/trunk/worlds/simpleshapes.world
Removed Paths:
-------------
code/gazebo/trunk/ogre_patch.diff
Modified: code/gazebo/trunk/Media/materials/scripts/Gazebo.material
===================================================================
--- code/gazebo/trunk/Media/materials/scripts/Gazebo.material 2009-06-11
03:36:53 UTC (rev 7840)
+++ code/gazebo/trunk/Media/materials/scripts/Gazebo.material 2009-06-11
15:47:34 UTC (rev 7841)
@@ -46,12 +46,14 @@
ambient 1.000000 1.000000 1.000000 1.000000
diffuse 1.0 1.0 1.0 1.0
specular 0.8 0.8 0.8 1 20
+ shading phong
}
pass PointLight
{
ambient 1.000000 1.000000 1.000000 1.000000
diffuse 1.0 1.0 1.0 1.0
specular 0.8 0.8 0.8 1 20
+ shading phong
}
}
@@ -69,6 +71,7 @@
ambient 0.3 0.3 0.3 1.0
diffuse 0.5 0.5 0.5 1.0
specular 0.8 0.8 0.8 1
+ shading phong
}
}
}
@@ -120,6 +123,7 @@
specular 0.000000 0.000000 0.000000 1.000000
emissive 0.000000 0.000000 0.000000 0.000000
lighting on
+ shading phong
}
}
}
@@ -137,6 +141,7 @@
specular 0.200000 0.000000 0.000000 1.000000
emissive 0.000000 0.000000 0.000000 1.000000
lighting on
+ shading phong
}
}
}
@@ -154,6 +159,7 @@
specular 0.000000 0.000000 0.000000 1.000000
emissive 0.000000 0.000000 0.000000 0.000000
lighting on
+ shading phong
}
}
}
@@ -257,6 +263,7 @@
specular 0.000000 0.000000 0.200000 1.000000
emissive 0.000000 0.000000 0.000000 1.000000
lighting on
+ shading phong
}
}
}
@@ -454,7 +461,22 @@
}
}
+material Gazebo/GrayGrid
+{
+ technique
+ {
+ pass
+ {
+ //ambient 0.2 0.2 0.2
+ texture_unit
+ {
+ texture grayGrid.png
+ }
+ }
+ }
+}
+
material Gazebo/Rocky
{
technique
Deleted: code/gazebo/trunk/ogre_patch.diff
===================================================================
--- code/gazebo/trunk/ogre_patch.diff 2009-06-11 03:36:53 UTC (rev 7840)
+++ code/gazebo/trunk/ogre_patch.diff 2009-06-11 15:47:34 UTC (rev 7841)
@@ -1,13 +0,0 @@
-Index: RenderSystems/GL/src/GLX/OgreGLXWindow.cpp
-===================================================================
---- RenderSystems/GL/src/GLX/OgreGLXWindow.cpp (revision 8673)
-+++ RenderSystems/GL/src/GLX/OgreGLXWindow.cpp (working copy)
-@@ -543,6 +543,8 @@
- mWidth = width;
- mHeight = height;
-
-+ XResizeWindow(mGLSupport->getXDisplay(),
mWindow, width, height);
-+
- for (ViewportList::iterator it =
mViewportList.begin(); it != mViewportList.end(); ++it)
- (*it).second->_updateDimensions();
- }
Modified: code/gazebo/trunk/server/rendering/OgreAdaptor.cc
===================================================================
--- code/gazebo/trunk/server/rendering/OgreAdaptor.cc 2009-06-11 03:36:53 UTC
(rev 7840)
+++ code/gazebo/trunk/server/rendering/OgreAdaptor.cc 2009-06-11 15:47:34 UTC
(rev 7841)
@@ -70,7 +70,7 @@
this->dummyDisplay = false;
Param::Begin(&this->parameters);
- this->ambientP = new ParamT<Vector4>("ambient",Vector4(.1,.1,.1,1),0);
+ this->ambientP = new ParamT<Vector4>("ambient",Vector4(.1,.1,.1,.1),0);
this->shadowTextureSizeP = new ParamT<int>("shadowTextureSize", 512,0);
this->shadowTechniqueP = new ParamT<std::string>("shadowTechnique",
"stencilAdditive", 0);
this->drawGridP = new ParamT<bool>("grid", true, 0);
Modified: code/gazebo/trunk/worlds/pioneer2dx.world
===================================================================
--- code/gazebo/trunk/worlds/pioneer2dx.world 2009-06-11 03:36:53 UTC (rev
7840)
+++ code/gazebo/trunk/worlds/pioneer2dx.world 2009-06-11 15:47:34 UTC (rev
7841)
@@ -38,7 +38,7 @@
</rendering:gui>
<rendering:ogre>
- <ambient>0.2 0.2 0.2 1.0</ambient>
+ <ambient>0.2 0.2 0.2 0.2</ambient>
<sky>
<material>Gazebo/CloudySky</material>
</sky>
@@ -49,6 +49,8 @@
<linearEnd>100</linearEnd>
</fog>
+ <grid>false</grid>
+
<shadowTechnique>stencilAdditive</shadowTechnique>
</rendering:ogre>
@@ -63,8 +65,8 @@
<normal>0 0 1</normal>
<size>2000 2000</size>
<segments>10 10</segments>
- <uvTile>100 100</uvTile>
- <material>Gazebo/Grey</material>
+ <uvTile>2000 2000</uvTile>
+ <material>Gazebo/GrayGrid</material>
</geom:plane>
</body:plane>
</model:physical>
@@ -160,7 +162,7 @@
<range>20</range>
<!-- Constant(0-1) Linear(0-1) Quadratic -->
- <attenuation>0.5 0.1 0</attenuation>
+ <attenuation>0.3 0.01 0</attenuation>
</light>
</model:renderable>
Modified: code/gazebo/trunk/worlds/simpleshapes.world
===================================================================
--- code/gazebo/trunk/worlds/simpleshapes.world 2009-06-11 03:36:53 UTC (rev
7840)
+++ code/gazebo/trunk/worlds/simpleshapes.world 2009-06-11 15:47:34 UTC (rev
7841)
@@ -33,12 +33,12 @@
</rendering:gui>
<rendering:ogre>
- <ambient>0.0 0.0 0.0 1.0</ambient>
+ <ambient>0 0 0 0</ambient>
<sky>
<material>Gazebo/CloudySky</material>
</sky>
<shadowTechnique>stencilAdditive</shadowTechnique>
- <grid>true</grid>
+ <grid>false</grid>
</rendering:ogre>
<model:physical name="sphere1_model">
@@ -111,26 +111,43 @@
<size>100 100</size>
<segments>10 10</segments>
<uvTile>100 100</uvTile>
- <material>Gazebo/Rockwall</material>
+ <material>Gazebo/GrayGrid</material>
<mu1>109999.0</mu1>
<mu2>1000.0</mu2>
</geom:plane>
</body:plane>
</model:physical>
+ <!-- Directional light -->
+ <model:renderable name="directional_white">
+ <enableGravity>false</enableGravity>
+
+ <light>
+ <type>directional</type>
+ <direction>0 0 -1</direction>
+ <diffuseColor>0.3 0.3 0.3</diffuseColor>
+ <specularColor>.1 .1 .1</specularColor>
+ <range>20</range>
+ <castShadows>false</castShadows>
+
+ <!-- Constant(0-1) Linear(0-1) Quadratic -->
+ <attenuation>0.2 0.01 0.001</attenuation>
+ </light>
+ </model:renderable>
+
<!-- White Point light -->
<model:renderable name="point_white">
- <xyz>2 1 2</xyz>
+ <xyz>-4 4 5</xyz>
<enableGravity>false</enableGravity>
<light>
<type>point</type>
- <diffuseColor>0.9 0.9 0.9</diffuseColor>
- <specularColor>1 1 1</specularColor>
+ <diffuseColor>0.4 0.4 0.4</diffuseColor>
+ <specularColor>.1 .1 .1</specularColor>
<range>20</range>
<!-- Constant(0-1) Linear(0-1) Quadratic -->
- <attenuation>0.2 0.01 0.0</attenuation>
+ <attenuation>0.5 0.01 0.001</attenuation>
</light>
</model:renderable>
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Crystal Reports - New Free Runtime and 30 Day Trial
Check out the new simplified licensing option that enables unlimited
royalty-free distribution of the report engine for externally facing
server and web deployment.
http://p.sf.net/sfu/businessobjects
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
