Revision: 7844
http://playerstage.svn.sourceforge.net/playerstage/?rev=7844&view=rev
Author: natepak
Date: 2009-06-11 16:53:37 +0000 (Thu, 11 Jun 2009)
Log Message:
-----------
Added compile flag to enable shadows
Modified Paths:
--------------
code/gazebo/trunk/CMakeLists.txt
code/gazebo/trunk/config.h.in
code/gazebo/trunk/server/rendering/OgreCreator.cc
code/gazebo/trunk/worlds/pioneer2dx.world
Modified: code/gazebo/trunk/CMakeLists.txt
===================================================================
--- code/gazebo/trunk/CMakeLists.txt 2009-06-11 16:07:08 UTC (rev 7843)
+++ code/gazebo/trunk/CMakeLists.txt 2009-06-11 16:53:37 UTC (rev 7844)
@@ -10,6 +10,7 @@
SET (GAZEBO_VERSION 0.9.0)
MESSAGE (STATUS "${PROJECT_NAME} version ${GAZEBO_VERSION}")
+SET (ENABLE_SHADOWS OFF CACHE BOOL "If ON, must apply ogre_patch.diff to Ogre
sources")
SET (BUILD_GAZEBO ON CACHE INTERNAL "Build Gazebo" FORCE)
SET (gazeboserver_sources_desc "List of server sources"
Modified: code/gazebo/trunk/config.h.in
===================================================================
--- code/gazebo/trunk/config.h.in 2009-06-11 16:07:08 UTC (rev 7843)
+++ code/gazebo/trunk/config.h.in 2009-06-11 16:53:37 UTC (rev 7844)
@@ -6,3 +6,4 @@
#cmakedefine HAVE_OPENAL 1
#cmakedefine HAVE_FFMPEG 1
#cmakedefine HAVE_LTDL 1
+#cmakedefine ENABLE_SHADOWS 0
Modified: code/gazebo/trunk/server/rendering/OgreCreator.cc
===================================================================
--- code/gazebo/trunk/server/rendering/OgreCreator.cc 2009-06-11 16:07:08 UTC
(rev 7843)
+++ code/gazebo/trunk/server/rendering/OgreCreator.cc 2009-06-11 16:53:37 UTC
(rev 7844)
@@ -32,6 +32,8 @@
#include <FL/Fl.H>
#include <FL/x.H>
+#include "config.h"
+
#include "Simulator.hh"
#include "Global.hh"
#include "Entity.hh"
@@ -650,8 +652,11 @@
ogreHandle << winId;
+#ifdef ENABLE_SHADOWS
params["parentWindowHandle"] = ogreHandle.str();
- //params["currentGLContext"] = ogreHandle.str();
+#else
+ params["externalWindowHandle"] = ogreHandle.str();
+#endif
//params["vsync"] = "true";
params["FSAA"] = "2";
Modified: code/gazebo/trunk/worlds/pioneer2dx.world
===================================================================
--- code/gazebo/trunk/worlds/pioneer2dx.world 2009-06-11 16:07:08 UTC (rev
7843)
+++ code/gazebo/trunk/worlds/pioneer2dx.world 2009-06-11 16:53:37 UTC (rev
7844)
@@ -150,9 +150,26 @@
</model:physical>
+ <!-- Directional light -->
+ <model:renderable name="directional_white">
+ <enableGravity>false</enableGravity>
+
+ <light>
+ <type>directional</type>
+ <direction>0 0 -1</direction>
+ <diffuseColor>0.4 0.4 0.4</diffuseColor>
+ <specularColor>0.1 0.1 0.1</specularColor>
+ <range>40</range>
+
+ <!-- Constant(0-1) Linear(0-1) Quadratic -->
+ <attenuation>0 0 0</attenuation>
+ </light>
+ </model:renderable>
+
+
<!-- White Point light -->
<model:renderable name="point_white">
- <xyz>0 2 2</xyz>
+ <xyz>0 3 5</xyz>
<enableGravity>false</enableGravity>
<light>
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
