Revision: 8572
http://playerstage.svn.sourceforge.net/playerstage/?rev=8572&view=rev
Author: natepak
Date: 2010-03-09 21:22:33 +0000 (Tue, 09 Mar 2010)
Log Message:
-----------
Fixed the rt shader system
Modified Paths:
--------------
code/gazebo/trunk/Media/materials/programs/CMakeLists.txt
code/gazebo/trunk/Media/materials/scripts/Gazebo.material
code/gazebo/trunk/Media/rtshaderlib/CMakeLists.txt
code/gazebo/trunk/server/rendering/RTShaderSystem.cc
Modified: code/gazebo/trunk/Media/materials/programs/CMakeLists.txt
===================================================================
--- code/gazebo/trunk/Media/materials/programs/CMakeLists.txt 2010-03-09
19:41:05 UTC (rev 8571)
+++ code/gazebo/trunk/Media/materials/programs/CMakeLists.txt 2010-03-09
21:22:33 UTC (rev 8572)
@@ -12,6 +12,6 @@
# Ambient.frag
#)
-SET (files PointLight.vert PointLight.frag)
+SET (files PointLight.vert PointLight.frag DepthMap.frag DepthMap.vert)
INSTALL(FILES ${files} DESTINATION
${CMAKE_INSTALL_PREFIX}/share/gazebo/Media/materials/programs/)
Modified: code/gazebo/trunk/Media/materials/scripts/Gazebo.material
===================================================================
--- code/gazebo/trunk/Media/materials/scripts/Gazebo.material 2010-03-09
19:41:05 UTC (rev 8571)
+++ code/gazebo/trunk/Media/materials/scripts/Gazebo.material 2010-03-09
21:22:33 UTC (rev 8572)
@@ -953,9 +953,12 @@
scene_blend alpha_blend
depth_write off
+ ambient 1.0 0.0 0.0 1
+ diffuse 1.0 0.0 0.0 1
+
texture_unit
{
- colour_op_ex source1 src_manual src_current 1 0 0
+ colour_op_ex source1 src_current src_current 1 0 0
alpha_op_ex source1 src_manual src_current 0.1
}
}
@@ -990,7 +993,7 @@
texture_unit
{
colour_op_ex source1 src_manual src_current 0.2 0.43 0.36
- alpha_op_ex source1 src_manual src_current 0.2
+ alpha_op_ex source1 src_manual src_current 0.2
}
}
}
Modified: code/gazebo/trunk/Media/rtshaderlib/CMakeLists.txt
===================================================================
--- code/gazebo/trunk/Media/rtshaderlib/CMakeLists.txt 2010-03-09 19:41:05 UTC
(rev 8571)
+++ code/gazebo/trunk/Media/rtshaderlib/CMakeLists.txt 2010-03-09 21:22:33 UTC
(rev 8572)
@@ -1,32 +1,34 @@
add_subdirectory(materials)
-set (files FFPLib_Common.cg
- FFPLib_Common.glsl
- FFPLib_Common.hlsl
- FFPLib_Fog.cg
- FFPLib_Fog.glsl
- FFPLib_Fog.hlsl
- FFPLib_Lighting.cg
- FFPLib_Lighting.glsl
- FFPLib_Lighting.hlsl
- FFPLib_Texturing.cg
- FFPLib_Texturing.glsl
- FFPLib_Texturing.hlsl
- FFPLib_Transform.cg
- FFPLib_Transform.glsl
- FFPLib_Transform.hlsl
- SampleLib_ReflectionMap.cg
- SampleLib_ReflectionMap.glsl
- SampleLib_ReflectionMap.hlsl
- SGXLib_IntegratedPSSM.cg
- SGXLib_IntegratedPSSM.glsl
- SGXLib_IntegratedPSSM.hlsl
- SGXLib_NormalMapLighting.cg
- SGXLib_NormalMapLighting.glsl
- SGXLib_NormalMapLighting.hlsl
- SGXLib_PerPixelLighting.cg
- SGXLib_PerPixelLighting.glsl
- SGXLib_PerPixelLighting.hlsl
+set (files
+FFPLib_Common.cg
+FFPLib_Common.hlsl
+FFPLib_Common.glsl
+FFPLib_Fog.cg
+FFPLib_Fog.glsl
+FFPLib_Fog.hlsl
+FFPLib_Lighting.cg
+FFPLib_Lighting.glsl
+FFPLib_Lighting.hlsl
+FFPLib_Texturing.cg
+FFPLib_Texturing.glsl
+FFPLib_Texturing.hlsl
+FFPLib_Transform.cg
+FFPLib_Transform.glsl
+FFPLib_Transform.hlsl
+SampleLib_ReflectionMap.cg
+SampleLib_ReflectionMap.glsl
+SampleLib_ReflectionMap.hlsl
+SGXLib_IntegratedPSSM.cg
+SGXLib_IntegratedPSSM.glsl
+SGXLib_IntegratedPSSM.hlsl
+SGXLib_NormalMapLighting.cg
+SGXLib_NormalMapLighting.glsl
+SGXLib_NormalMapLighting.hlsl
+SGXLib_PerPixelLighting.cg
+SGXLib_PerPixelLighting.glsl
+SGXLib_PerPixelLighting.hlsl
)
install(FILES ${files} DESTINATION
${CMAKE_INSTALL_PREFIX}/share/gazebo/Media/rtshaderlib)
+
Modified: code/gazebo/trunk/server/rendering/RTShaderSystem.cc
===================================================================
--- code/gazebo/trunk/server/rendering/RTShaderSystem.cc 2010-03-09
19:41:05 UTC (rev 8571)
+++ code/gazebo/trunk/server/rendering/RTShaderSystem.cc 2010-03-09
21:22:33 UTC (rev 8572)
@@ -102,7 +102,7 @@
for (; it != itEnd; ++it)
{
- if ((*it)->archive->getName().find("RTShaderLib") !=
Ogre::String::npos)
+ if ((*it)->archive->getName().find("rtshaderlib") !=
Ogre::String::npos)
{
shaderCoreLibsPath = (*it)->archive->getName() + "/";
shaderCachePath = shaderCoreLibsPath;
@@ -123,10 +123,10 @@
return;
}
-#ifdef _RTSS_WRITE_SHADERS_TO_DISK
+
Ogre::ResourceGroupManager::getSingleton().addResourceLocation(shaderCoreLibsPath,
"FileSystem");
+
// Set shader cache path.
- this->shaderGenerator->setShaderCachePath(shaderCachePath);
-#endif
+ this->shaderGenerator->setShaderCachePath(shaderCachePath);
// Create and register the material manager listener.
this->materialMgrListener = new
ShaderGeneratorTechniqueResolverListener(this->shaderGenerator);
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Download Intel® Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
