[Python-ogre-commit] SF.net SVN: python-ogre: [382] trunk/python-ogre/demos
Brought to you by:
andy_miller,
roman_yakovenko
From: <and...@us...> - 2007-09-18 11:55:36
|
Revision: 382 http://python-ogre.svn.sourceforge.net/python-ogre/?rev=382&view=rev Author: andy_miller Date: 2007-09-18 04:55:38 -0700 (Tue, 18 Sep 2007) Log Message: ----------- Updating media to the OgreSDK standard set -- extras will go in the demo folders Modified Paths: -------------- trunk/python-ogre/demos/OgreNewt/Demo01_TheBasics.py trunk/python-ogre/demos/OgreNewt/Demo02_Joints.py trunk/python-ogre/demos/OgreNewt/Demo03_CollisionCallbacks.py trunk/python-ogre/demos/OgreNewt/Demo04_RayCasting.py trunk/python-ogre/demos/OgreNewt/Demo05_SimpleVehicle.py trunk/python-ogre/demos/OgreNewt/Demo06_SimpleBuoyancy.py trunk/python-ogre/demos/OgreNewt/Demo07_CustomJoints.py trunk/python-ogre/demos/OgreNewt/Demo08_Ragdoll.py trunk/python-ogre/demos/OgreNewt/SimpleVehicle.py trunk/python-ogre/demos/OgreNewt/resources.cfg Added Paths: ----------- trunk/python-ogre/demos/media/ trunk/python-ogre/demos/media/DeferredShadingMedia/ trunk/python-ogre/demos/media/DeferredShadingMedia/COPYING trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/ trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/material/ trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/material/glsl/ trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/material/glsl/nm_notex_ps.glsl trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/material/glsl/nm_ps.glsl trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/material/glsl/nm_vs.glsl trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/material/glsl/notex_ps.glsl trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/material/glsl/ps.glsl trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/material/glsl/vs.glsl trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/material/hlsl/ trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/material/hlsl/nm_notex_ps.hlsl trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/material/hlsl/nm_ps.hlsl trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/material/hlsl/nm_vs.hlsl trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/material/hlsl/notex_ps.hlsl trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/material/hlsl/ps.hlsl trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/material/hlsl/vs.hlsl trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/post/ trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/post/glsl/ trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/post/glsl/Ambient_ps.glsl trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/post/glsl/GlobalLight_ps.glsl trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/post/glsl/LightMaterial_ps.glsl trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/post/glsl/LightMaterial_vs.glsl trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/post/glsl/ShowColour_ps.glsl trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/post/glsl/ShowDS_ps.glsl trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/post/glsl/ShowNormal_ps.glsl trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/post/glsl/SinglePass_ps.glsl trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/post/glsl/vs.glsl trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/post/hlsl/ trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/post/hlsl/Ambient_ps.hlsl trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/post/hlsl/GlobalLight_ps.hlsl trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/post/hlsl/LightMaterial_ps.hlsl trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/post/hlsl/LightMaterial_vs.hlsl trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/post/hlsl/ShowColour_ps.hlsl trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/post/hlsl/ShowDS_ps.hlsl trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/post/hlsl/ShowNormal_ps.hlsl trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/post/hlsl/SinglePass_ps.hlsl trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/post/hlsl/vs.hlsl trunk/python-ogre/demos/media/DeferredShadingMedia/deferred.glsl.program trunk/python-ogre/demos/media/DeferredShadingMedia/deferred.hlsl.program trunk/python-ogre/demos/media/DeferredShadingMedia/deferred.material trunk/python-ogre/demos/media/DeferredShadingMedia/deferred_post_debug.glsl.program trunk/python-ogre/demos/media/DeferredShadingMedia/deferred_post_debug.hlsl.program trunk/python-ogre/demos/media/DeferredShadingMedia/deferred_post_debug.material trunk/python-ogre/demos/media/DeferredShadingMedia/deferred_post_minilight.glsl.program trunk/python-ogre/demos/media/DeferredShadingMedia/deferred_post_minilight.hlsl.program trunk/python-ogre/demos/media/DeferredShadingMedia/deferred_post_minilight.material trunk/python-ogre/demos/media/DeferredShadingMedia/deferred_post_multipass.glsl.program trunk/python-ogre/demos/media/DeferredShadingMedia/deferred_post_multipass.hlsl.program trunk/python-ogre/demos/media/DeferredShadingMedia/deferred_post_multipass.material trunk/python-ogre/demos/media/DeferredShadingMedia/deferred_post_onepass.glsl.program trunk/python-ogre/demos/media/DeferredShadingMedia/deferred_post_onepass.hlsl.program trunk/python-ogre/demos/media/DeferredShadingMedia/deferred_post_onepass.material trunk/python-ogre/demos/media/DeferredShadingMedia/deferreddemo.material trunk/python-ogre/demos/media/fonts/ trunk/python-ogre/demos/media/fonts/bluebold.ttf trunk/python-ogre/demos/media/fonts/bluecond.ttf trunk/python-ogre/demos/media/fonts/bluehigh.ttf trunk/python-ogre/demos/media/fonts/read_me.html trunk/python-ogre/demos/media/fonts/sample.fontdef trunk/python-ogre/demos/media/fonts/solo5.ttf trunk/python-ogre/demos/media/gui/ trunk/python-ogre/demos/media/gui/CompositorDemo.layout trunk/python-ogre/demos/media/gui/CompositorDemoCegui.config trunk/python-ogre/demos/media/gui/CrowdDemo.layout trunk/python-ogre/demos/media/gui/Falagard.xsd trunk/python-ogre/demos/media/gui/Font.xsd trunk/python-ogre/demos/media/gui/GUILayout.xsd trunk/python-ogre/demos/media/gui/GUIScheme.xsd trunk/python-ogre/demos/media/gui/Imageset.xsd trunk/python-ogre/demos/media/gui/InstancingDemo.layout trunk/python-ogre/demos/media/gui/OceanDemoCegui.config trunk/python-ogre/demos/media/gui/OceanDemoLayout.xml trunk/python-ogre/demos/media/gui/TaharezLook.imageset trunk/python-ogre/demos/media/gui/TaharezLook.looknfeel trunk/python-ogre/demos/media/gui/TaharezLook.tga trunk/python-ogre/demos/media/gui/TaharezLookSkin.scheme trunk/python-ogre/demos/media/gui/TaharezLookWidgetAliases.scheme trunk/python-ogre/demos/media/gui/bluehighway-10.font trunk/python-ogre/demos/media/gui/bluehighway-12.font trunk/python-ogre/demos/media/gui/bluehighway-8.font trunk/python-ogre/demos/media/gui/cegui8.layout trunk/python-ogre/demos/media/gui/facial.layout trunk/python-ogre/demos/media/gui/ogregui.layout trunk/python-ogre/demos/media/gui/shadows.layout trunk/python-ogre/demos/media/materials/ trunk/python-ogre/demos/media/materials/programs/ trunk/python-ogre/demos/media/materials/programs/AmbientOneTexture.glsl trunk/python-ogre/demos/media/materials/programs/Bloom_ps20.hlsl trunk/python-ogre/demos/media/materials/programs/Bloom_vs11.hlsl trunk/python-ogre/demos/media/materials/programs/Blur0_ps20.hlsl trunk/python-ogre/demos/media/materials/programs/Blur0_vs.glsl trunk/python-ogre/demos/media/materials/programs/Blur0_vs11.hlsl trunk/python-ogre/demos/media/materials/programs/Blur1_ps20.hlsl trunk/python-ogre/demos/media/materials/programs/Blur1_vs.glsl trunk/python-ogre/demos/media/materials/programs/Blur1_vs11.hlsl trunk/python-ogre/demos/media/materials/programs/Blur_ps.glsl trunk/python-ogre/demos/media/materials/programs/Combine_fp.cg trunk/python-ogre/demos/media/materials/programs/DOF_ps.cg trunk/python-ogre/demos/media/materials/programs/DepthShadowmap.hlsl trunk/python-ogre/demos/media/materials/programs/DepthShadowmapCasterFp.glsl trunk/python-ogre/demos/media/materials/programs/DepthShadowmapCasterVp.glsl trunk/python-ogre/demos/media/materials/programs/DepthShadowmapNormalMapReceiverFp.glsl trunk/python-ogre/demos/media/materials/programs/DepthShadowmapNormalMapReceiverVp.glsl trunk/python-ogre/demos/media/materials/programs/DepthShadowmapReceiverFp.glsl trunk/python-ogre/demos/media/materials/programs/DepthShadowmapReceiverVp.glsl trunk/python-ogre/demos/media/materials/programs/Example_Basic.cg trunk/python-ogre/demos/media/materials/programs/Example_Basic.hlsl trunk/python-ogre/demos/media/materials/programs/Example_BumpMapping.cg trunk/python-ogre/demos/media/materials/programs/Example_CelShading.cg trunk/python-ogre/demos/media/materials/programs/Example_Fresnel.cg trunk/python-ogre/demos/media/materials/programs/Example_FresnelPS.asm trunk/python-ogre/demos/media/materials/programs/Example_Projection.cg trunk/python-ogre/demos/media/materials/programs/GlassFP.cg trunk/python-ogre/demos/media/materials/programs/Grass.cg trunk/python-ogre/demos/media/materials/programs/GrayScale.cg trunk/python-ogre/demos/media/materials/programs/HeatVision.cg trunk/python-ogre/demos/media/materials/programs/InvertFP.cg trunk/python-ogre/demos/media/materials/programs/LaplaceFP.cg trunk/python-ogre/demos/media/materials/programs/Ocean2GLSL.frag trunk/python-ogre/demos/media/materials/programs/Ocean2GLSL.vert trunk/python-ogre/demos/media/materials/programs/Ocean2HLSL_Cg.frag trunk/python-ogre/demos/media/materials/programs/Ocean2HLSL_Cg.vert trunk/python-ogre/demos/media/materials/programs/OffsetMapping.cg trunk/python-ogre/demos/media/materials/programs/OffsetMapping.hlsl trunk/python-ogre/demos/media/materials/programs/OffsetMappingFp.glsl trunk/python-ogre/demos/media/materials/programs/OffsetMappingVp.glsl trunk/python-ogre/demos/media/materials/programs/OffsetMapping_specular.asm trunk/python-ogre/demos/media/materials/programs/OldMovieFP.cg trunk/python-ogre/demos/media/materials/programs/OldTV.cg trunk/python-ogre/demos/media/materials/programs/PosterizeFP.cg trunk/python-ogre/demos/media/materials/programs/SharpenEdgesFP.cg trunk/python-ogre/demos/media/materials/programs/StdQuad_vp.cg trunk/python-ogre/demos/media/materials/programs/StdQuad_vp.glsl trunk/python-ogre/demos/media/materials/programs/TilingFP.cg trunk/python-ogre/demos/media/materials/programs/crowdVp.glsl trunk/python-ogre/demos/media/materials/programs/hdr.cg trunk/python-ogre/demos/media/materials/programs/hdr.hlsl trunk/python-ogre/demos/media/materials/programs/hdr_bloom.glsl trunk/python-ogre/demos/media/materials/programs/hdr_downscale2x2luminence.glsl trunk/python-ogre/demos/media/materials/programs/hdr_downscale3x3.glsl trunk/python-ogre/demos/media/materials/programs/hdr_downscale3x3brightpass.glsl trunk/python-ogre/demos/media/materials/programs/hdr_finalToneMapping.glsl trunk/python-ogre/demos/media/materials/programs/hdr_tonemap_util.glsl trunk/python-ogre/demos/media/materials/programs/instancing.cg trunk/python-ogre/demos/media/materials/programs/instancingVp.glsl trunk/python-ogre/demos/media/materials/programs/oceanGLSL.frag trunk/python-ogre/demos/media/materials/programs/oceanGLSL.vert trunk/python-ogre/demos/media/materials/programs/oceanHLSL_Cg.frag trunk/python-ogre/demos/media/materials/programs/oceanHLSL_Cg.vert trunk/python-ogre/demos/media/materials/programs/skinningTwoWeightsShadowCasterVp.glsl trunk/python-ogre/demos/media/materials/programs/skinningTwoWeightsVp.glsl trunk/python-ogre/demos/media/materials/programs/varianceshadowcasterfp.cg trunk/python-ogre/demos/media/materials/programs/varianceshadowcastervp.cg trunk/python-ogre/demos/media/materials/programs/varianceshadowreceiverfp.cg trunk/python-ogre/demos/media/materials/programs/varianceshadowreceivervp.cg trunk/python-ogre/demos/media/materials/scripts/ trunk/python-ogre/demos/media/materials/scripts/BlackAndWhite.material trunk/python-ogre/demos/media/materials/scripts/Bloom.material trunk/python-ogre/demos/media/materials/scripts/DOF.material trunk/python-ogre/demos/media/materials/scripts/DepthShadowmap.material trunk/python-ogre/demos/media/materials/scripts/Embossed.material trunk/python-ogre/demos/media/materials/scripts/Example-DynTex.material trunk/python-ogre/demos/media/materials/scripts/Example-Water.material trunk/python-ogre/demos/media/materials/scripts/Example.material trunk/python-ogre/demos/media/materials/scripts/Examples-Advanced.material trunk/python-ogre/demos/media/materials/scripts/Examples.compositor trunk/python-ogre/demos/media/materials/scripts/Examples.program trunk/python-ogre/demos/media/materials/scripts/Glass.material trunk/python-ogre/demos/media/materials/scripts/HeatVision.material trunk/python-ogre/demos/media/materials/scripts/Hurt.material trunk/python-ogre/demos/media/materials/scripts/Invert.material trunk/python-ogre/demos/media/materials/scripts/Laplace.material trunk/python-ogre/demos/media/materials/scripts/MotionBlur.material trunk/python-ogre/demos/media/materials/scripts/Ocean.controls trunk/python-ogre/demos/media/materials/scripts/Ocean.material trunk/python-ogre/demos/media/materials/scripts/OffsetMapping.material trunk/python-ogre/demos/media/materials/scripts/Ogre.material trunk/python-ogre/demos/media/materials/scripts/OldMovie.material trunk/python-ogre/demos/media/materials/scripts/OldTV.material trunk/python-ogre/demos/media/materials/scripts/Posterize.material trunk/python-ogre/demos/media/materials/scripts/RZR-002.material trunk/python-ogre/demos/media/materials/scripts/SharpenEdges.material trunk/python-ogre/demos/media/materials/scripts/StdQuad_vp.program trunk/python-ogre/demos/media/materials/scripts/Tiling.material trunk/python-ogre/demos/media/materials/scripts/VarianceShadowmap.material trunk/python-ogre/demos/media/materials/scripts/facial.material trunk/python-ogre/demos/media/materials/scripts/hdr.material trunk/python-ogre/demos/media/materials/scripts/instancing.material trunk/python-ogre/demos/media/materials/scripts/smoke.material trunk/python-ogre/demos/media/materials/textures/ trunk/python-ogre/demos/media/materials/textures/10points.png trunk/python-ogre/demos/media/materials/textures/1D_Noise.png trunk/python-ogre/demos/media/materials/textures/1D_Noise2.png trunk/python-ogre/demos/media/materials/textures/8x8PagesSplotches2.png trunk/python-ogre/demos/media/materials/textures/BeachStones.jpg trunk/python-ogre/demos/media/materials/textures/BumpyMetal.jpg trunk/python-ogre/demos/media/materials/textures/Chrome.jpg trunk/python-ogre/demos/media/materials/textures/Dirt.jpg trunk/python-ogre/demos/media/materials/textures/Dr_Bunsen_Head.jpg trunk/python-ogre/demos/media/materials/textures/GLX_icon.png trunk/python-ogre/demos/media/materials/textures/GreenSkin.jpg trunk/python-ogre/demos/media/materials/textures/HeatLookup.tga trunk/python-ogre/demos/media/materials/textures/HeatNoise.tga trunk/python-ogre/demos/media/materials/textures/MtlPlat2.jpg trunk/python-ogre/demos/media/materials/textures/NMBalls.png trunk/python-ogre/demos/media/materials/textures/NMBumpsOut.png trunk/python-ogre/demos/media/materials/textures/NMHollyBumps.png trunk/python-ogre/demos/media/materials/textures/NMStripes.png trunk/python-ogre/demos/media/materials/textures/NPRMetallic.tga trunk/python-ogre/demos/media/materials/textures/NoiseVolume.dds trunk/python-ogre/demos/media/materials/textures/RZR-002.png trunk/python-ogre/demos/media/materials/textures/Random3D.dds trunk/python-ogre/demos/media/materials/textures/RustedMetal.jpg trunk/python-ogre/demos/media/materials/textures/RustyBarrel.png trunk/python-ogre/demos/media/materials/textures/RustySteel.jpg trunk/python-ogre/demos/media/materials/textures/Sepia1D.tga trunk/python-ogre/demos/media/materials/textures/Water01.jpg trunk/python-ogre/demos/media/materials/textures/Water02.jpg trunk/python-ogre/demos/media/materials/textures/WaterNormal1.tga trunk/python-ogre/demos/media/materials/textures/WaterNormal2.tga trunk/python-ogre/demos/media/materials/textures/WeirdEye.png trunk/python-ogre/demos/media/materials/textures/WoodPallet.png trunk/python-ogre/demos/media/materials/textures/atheneNormalMap.png trunk/python-ogre/demos/media/materials/textures/aureola.png trunk/python-ogre/demos/media/materials/textures/basic_droplet.png trunk/python-ogre/demos/media/materials/textures/blue_jaiqua.jpg trunk/python-ogre/demos/media/materials/textures/cel_shading_diffuse.png trunk/python-ogre/demos/media/materials/textures/cel_shading_edge.png trunk/python-ogre/demos/media/materials/textures/cel_shading_specular.png trunk/python-ogre/demos/media/materials/textures/clouds.jpg trunk/python-ogre/demos/media/materials/textures/cursor.png trunk/python-ogre/demos/media/materials/textures/dirt01.jpg trunk/python-ogre/demos/media/materials/textures/dkyellow.png trunk/python-ogre/demos/media/materials/textures/droplet.png trunk/python-ogre/demos/media/materials/textures/egyptrockyfull.jpg trunk/python-ogre/demos/media/materials/textures/flare.png trunk/python-ogre/demos/media/materials/textures/flaretrail.png trunk/python-ogre/demos/media/materials/textures/fw12b.jpg trunk/python-ogre/demos/media/materials/textures/gras_02.png trunk/python-ogre/demos/media/materials/textures/grass_1024.jpg trunk/python-ogre/demos/media/materials/textures/nm_bk.png trunk/python-ogre/demos/media/materials/textures/nm_dn.png trunk/python-ogre/demos/media/materials/textures/nm_fr.png trunk/python-ogre/demos/media/materials/textures/nm_lf.png trunk/python-ogre/demos/media/materials/textures/nm_rt.png trunk/python-ogre/demos/media/materials/textures/nm_up.png trunk/python-ogre/demos/media/materials/textures/normalNoiseColor.png trunk/python-ogre/demos/media/materials/textures/nskingr.jpg trunk/python-ogre/demos/media/materials/textures/ogreborder.png trunk/python-ogre/demos/media/materials/textures/ogreborderUp.png trunk/python-ogre/demos/media/materials/textures/ogrebordercenter.png trunk/python-ogre/demos/media/materials/textures/ogregui.tga trunk/python-ogre/demos/media/materials/textures/ogrelogo-small.jpg trunk/python-ogre/demos/media/materials/textures/ogrelogo.png trunk/python-ogre/demos/media/materials/textures/perlinvolume.dds trunk/python-ogre/demos/media/materials/textures/r2skin.jpg trunk/python-ogre/demos/media/materials/textures/ribbonband.png trunk/python-ogre/demos/media/materials/textures/rockwall.tga trunk/python-ogre/demos/media/materials/textures/rockwall_NH.tga trunk/python-ogre/demos/media/materials/textures/scr-back.png trunk/python-ogre/demos/media/materials/textures/scr-down-p.png trunk/python-ogre/demos/media/materials/textures/scr-down.png trunk/python-ogre/demos/media/materials/textures/scr-thumb.png trunk/python-ogre/demos/media/materials/textures/scr-up-p.png trunk/python-ogre/demos/media/materials/textures/scr-up.png trunk/python-ogre/demos/media/materials/textures/smoke.png trunk/python-ogre/demos/media/materials/textures/smokecolors.png trunk/python-ogre/demos/media/materials/textures/snow_1024.jpg trunk/python-ogre/demos/media/materials/textures/spacesky.jpg trunk/python-ogre/demos/media/materials/textures/spheremap.png trunk/python-ogre/demos/media/materials/textures/steelhead.png trunk/python-ogre/demos/media/materials/textures/terr_dirt-grass.jpg trunk/python-ogre/demos/media/materials/textures/terr_rock-dirt.jpg trunk/python-ogre/demos/media/materials/textures/terr_rock6.jpg trunk/python-ogre/demos/media/materials/textures/terrain.png trunk/python-ogre/demos/media/materials/textures/terrain_detail.jpg trunk/python-ogre/demos/media/materials/textures/terrain_texture.jpg trunk/python-ogre/demos/media/materials/textures/texmap2.jpg trunk/python-ogre/demos/media/materials/textures/waveNM.png trunk/python-ogre/demos/media/materials/textures/waves2.dds trunk/python-ogre/demos/media/models/ trunk/python-ogre/demos/media/models/Barrel.mesh trunk/python-ogre/demos/media/models/RZR-002.mesh trunk/python-ogre/demos/media/models/WoodPallet.mesh trunk/python-ogre/demos/media/models/athene.mesh trunk/python-ogre/demos/media/models/column.mesh trunk/python-ogre/demos/media/models/cube.mesh trunk/python-ogre/demos/media/models/facial.mesh trunk/python-ogre/demos/media/models/fish.mesh trunk/python-ogre/demos/media/models/fish.skeleton trunk/python-ogre/demos/media/models/geosphere4500.mesh trunk/python-ogre/demos/media/models/geosphere8000.mesh trunk/python-ogre/demos/media/models/jaiqua.mesh trunk/python-ogre/demos/media/models/jaiqua.skeleton trunk/python-ogre/demos/media/models/knot.mesh trunk/python-ogre/demos/media/models/ninja.mesh trunk/python-ogre/demos/media/models/ninja.skeleton trunk/python-ogre/demos/media/models/ogrehead.mesh trunk/python-ogre/demos/media/models/razor.mesh trunk/python-ogre/demos/media/models/robot.mesh trunk/python-ogre/demos/media/models/robot.skeleton trunk/python-ogre/demos/media/models/sphere.mesh trunk/python-ogre/demos/media/models/tudorhouse.mesh trunk/python-ogre/demos/media/overlays/ trunk/python-ogre/demos/media/overlays/BasicOgreGuiTemplates.inc trunk/python-ogre/demos/media/overlays/Compositor.overlay trunk/python-ogre/demos/media/overlays/DP3.overlay trunk/python-ogre/demos/media/overlays/Example-CubeMapping.overlay trunk/python-ogre/demos/media/overlays/Example-DynTex.overlay trunk/python-ogre/demos/media/overlays/Example-Water.overlay trunk/python-ogre/demos/media/overlays/Shadows.overlay trunk/python-ogre/demos/media/packs/ trunk/python-ogre/demos/media/packs/OgreCore.zip trunk/python-ogre/demos/media/packs/chiropteraDM.pk3 trunk/python-ogre/demos/media/packs/chiropteraDM.txt trunk/python-ogre/demos/media/packs/cubemap.zip trunk/python-ogre/demos/media/packs/cubemapsJS.zip trunk/python-ogre/demos/media/packs/dragon.zip trunk/python-ogre/demos/media/packs/fresneldemo.zip trunk/python-ogre/demos/media/packs/ogretestmap.zip trunk/python-ogre/demos/media/packs/skybox.zip trunk/python-ogre/demos/media/particle/ trunk/python-ogre/demos/media/particle/Example-Water.particle trunk/python-ogre/demos/media/particle/Example.particle trunk/python-ogre/demos/media/particle/emitted_emitter.particle trunk/python-ogre/demos/media/particle/smoke.particle trunk/python-ogre/demos/media/terrain.cfg Modified: trunk/python-ogre/demos/OgreNewt/Demo01_TheBasics.py =================================================================== --- trunk/python-ogre/demos/OgreNewt/Demo01_TheBasics.py 2007-09-17 13:50:07 UTC (rev 381) +++ trunk/python-ogre/demos/OgreNewt/Demo01_TheBasics.py 2007-09-18 11:55:38 UTC (rev 382) @@ -41,7 +41,7 @@ floor.setNormaliseNormals(True) floornode = self.sceneManager.getRootSceneNode().createChildSceneNode( "FloorNode" ) floornode.attachObject( floor ) - floor.setMaterialName( "Simple/BeachStones" ) + floor.setMaterialName( "Examples/DarkMaterial" ) floor.setCastShadows( False ) ## okay, the basic mesh is loaded. now let's decide the size of the object, and scale the node. @@ -161,7 +161,7 @@ node.setPosition(0.0, 0.0, 0.0) - ent.setMaterialName( "Simple/dirt01" ) + ent.setMaterialName( "Examples/RustySteel" ) ent.setNormaliseNormals(True) ## again, make the collision shape. Modified: trunk/python-ogre/demos/OgreNewt/Demo02_Joints.py =================================================================== --- trunk/python-ogre/demos/OgreNewt/Demo02_Joints.py 2007-09-17 13:50:07 UTC (rev 381) +++ trunk/python-ogre/demos/OgreNewt/Demo02_Joints.py 2007-09-18 11:55:38 UTC (rev 382) @@ -51,7 +51,7 @@ bod.setMassMatrix( mass, inertia ) bod.setStandardForceCallback() - box1.setMaterialName( "Simple/BumpyMetal" ) + box1.setMaterialName( "Examples/RustySteel" ) bod.setPositionOrientation( pos, orient ) @@ -68,7 +68,7 @@ floor = self.sceneManager.createEntity("Floor", "simple_terrain.mesh" ) floornode = self.sceneManager.getRootSceneNode().createChildSceneNode( "FloorNode" ) floornode.attachObject( floor ) - floor.setMaterialName( "Simple/BeachStones" ) + floor.setMaterialName( "Examples/DarkMaterial" ) floor.setCastShadows( False ) ##------------------------------------------------------------- @@ -76,17 +76,17 @@ floor2 = self.sceneManager.createEntity("Floor2", "simple_terrain.mesh" ) floornode2 = floornode.createChildSceneNode( "FloorNode2" ) floornode2.attachObject( floor2 ) - floor2.setMaterialName( "Simple/BeachStones" ) + floor2.setMaterialName( "Examples/DarkMaterial" ) floor2.setCastShadows( False ) floornode2.setPosition( Ogre.Vector3(80.0, 0.0, 0.0) ) floor3 = self.sceneManager.createEntity("Floor3", "simple_terrain.mesh" ) floornode3 = floornode.createChildSceneNode( "FloorNode3" ) floornode3.attachObject( floor3 ) - floor3.setMaterialName( "Simple/BeachStones" ) + floor3.setMaterialName( "Examples/DarkMaterial" ) floor3.setCastShadows( False ) - floornode3.setPosition( Ogre.Vector3(-80.0, -5.0, 0.0) ) - floornode3.setOrientation( Ogre.Quaternion( Ogre.Degree(d=15.0), Ogre.Vector3.UNIT_Z ) ) + floornode3.setPosition( Ogre.Vector3(-80.0, 0.0, 0.0) ) + floornode3.setOrientation( Ogre.Quaternion( Ogre.Degree(d=0.0), Ogre.Vector3.UNIT_Z ) ) ##------------------------------------------------------------- ## using the new "SceneParser" TreeCollision primitive. this will automatically parse an entire tree of @@ -218,7 +218,7 @@ node = self.sceneManager.getRootSceneNode().createChildSceneNode( name ) node.attachObject( ent ) - ent.setMaterialName( "Simple/dirt01" ) + ent.setMaterialName( "Examples/RustySteel" ) ent.setNormaliseNormals(True) Modified: trunk/python-ogre/demos/OgreNewt/Demo03_CollisionCallbacks.py =================================================================== --- trunk/python-ogre/demos/OgreNewt/Demo03_CollisionCallbacks.py 2007-09-17 13:50:07 UTC (rev 381) +++ trunk/python-ogre/demos/OgreNewt/Demo03_CollisionCallbacks.py 2007-09-18 11:55:38 UTC (rev 382) @@ -54,7 +54,8 @@ self.Belts.append( belt ) belt = conveyorBelt() - belt.init( "ConveyorBelt2", self.sceneManager, self.World, Ogre.Vector3(23,0.3,4), Ogre.Vector3(-1,0,0), 6.0, Ogre.Vector3(3,-1,0), + belt.init( "ConveyorBelt2", self.sceneManager, self.World, Ogre.Vector3(23,0.3,4), + Ogre.Vector3(-1,0,0), 6.0, Ogre.Vector3(3,-1,0), Ogre.Quaternion.IDENTITY, self.MatConveyor, BT_CONVEYOR ) self.Belts.append( belt ) @@ -62,7 +63,7 @@ floor = self.sceneManager.createEntity("Floor", "simple_terrain.mesh" ) floornode = self.sceneManager.getRootSceneNode().createChildSceneNode( "FloorNode" ) floornode.attachObject( floor ) - floor.setMaterialName( "Simple/BeachStones" ) + floor.setMaterialName( "Examples/DarkMaterial" ) floor.setCastShadows( False ) @@ -178,7 +179,7 @@ node.setScale( size ) - ent.setMaterialName( "Simple/BumpyMetal" ) + ent.setMaterialName( "Examples/RustySteel" ) ent.setNormaliseNormals(True) col =OgreNewt.Box( self.World, size ) Modified: trunk/python-ogre/demos/OgreNewt/Demo04_RayCasting.py =================================================================== --- trunk/python-ogre/demos/OgreNewt/Demo04_RayCasting.py 2007-09-17 13:50:07 UTC (rev 381) +++ trunk/python-ogre/demos/OgreNewt/Demo04_RayCasting.py 2007-09-18 11:55:38 UTC (rev 382) @@ -77,7 +77,7 @@ floor = self.sceneManager.createEntity("Floor", "simple_terrain.mesh" ) floornode = self.sceneManager.getRootSceneNode().createChildSceneNode( "FloorNode" ) floornode.attachObject( floor ) - floor.setMaterialName( "Simple/BeachStones" ) + floor.setMaterialName( "Examples/DarkMaterial" ) floor.setCastShadows( False ) ##Ogre.Vector3 siz(100.0, 10.0, 100.0) @@ -160,7 +160,7 @@ bod.setMassMatrix( mass, inertia ) bod.setStandardForceCallback() - box1.setMaterialName( "Simple/BumpyMetal" ) + box1.setMaterialName( "Examples/BumpyMetal" ) bod.setPositionOrientation( pos, orient ) Modified: trunk/python-ogre/demos/OgreNewt/Demo05_SimpleVehicle.py =================================================================== --- trunk/python-ogre/demos/OgreNewt/Demo05_SimpleVehicle.py 2007-09-17 13:50:07 UTC (rev 381) +++ trunk/python-ogre/demos/OgreNewt/Demo05_SimpleVehicle.py 2007-09-18 11:55:38 UTC (rev 382) @@ -43,7 +43,7 @@ floor = self.sceneManager.createEntity("Floor", "simple_terrain.mesh" ) floornode = self.sceneManager.getRootSceneNode().createChildSceneNode( "FloorNode" ) floornode.attachObject( floor ) - floor.setMaterialName( "Simple/BeachStones" ) + floor.setMaterialName( "Examples/DarkMaterial" ) floornode.setScale(size) floor.setCastShadows( False ) @@ -97,7 +97,7 @@ bod.setMassMatrix( mass, inertia ) bod.setStandardForceCallback() - box1.setMaterialName( "Simple/BumpyMetal" ) + box1.setMaterialName( "Examples/BumpyMetal" ) bod.setPositionOrientation( pos, orient ) @@ -190,7 +190,7 @@ node.setPosition(0.0, 0.0, 0.0) - ent.setMaterialName( "Simple/dirt01" ) + ent.setMaterialName( "Examples/RustySteel" ) #ent.setNormaliseNormals(True) ## again, make the collision shape. Modified: trunk/python-ogre/demos/OgreNewt/Demo06_SimpleBuoyancy.py =================================================================== --- trunk/python-ogre/demos/OgreNewt/Demo06_SimpleBuoyancy.py 2007-09-17 13:50:07 UTC (rev 381) +++ trunk/python-ogre/demos/OgreNewt/Demo06_SimpleBuoyancy.py 2007-09-18 11:55:38 UTC (rev 382) @@ -82,7 +82,7 @@ floor = self.sceneManager.createEntity("Floor", "simple_terrain.mesh" ) floornode = self.sceneManager.getRootSceneNode().createChildSceneNode( "FloorNode" ) floornode.attachObject( floor ) - floor.setMaterialName( "Simple/BeachStones" ) + floor.setMaterialName( "Examples/DarkMaterial" ) floor.setCastShadows( False ) ##Ogre.Vector3 siz(100.0, 10.0, 100.0) @@ -195,7 +195,7 @@ bod.setMassMatrix( mass, inertia ) bod.setStandardForceCallback() - box1.setMaterialName( "Simple/BumpyMetal" ) + box1.setMaterialName( "Examples/BumpyMetal" ) bod.setPositionOrientation( pos, orient ) Modified: trunk/python-ogre/demos/OgreNewt/Demo07_CustomJoints.py =================================================================== --- trunk/python-ogre/demos/OgreNewt/Demo07_CustomJoints.py 2007-09-17 13:50:07 UTC (rev 381) +++ trunk/python-ogre/demos/OgreNewt/Demo07_CustomJoints.py 2007-09-18 11:55:38 UTC (rev 382) @@ -50,7 +50,7 @@ bod.setMassMatrix( mass, inertia ) bod.setStandardForceCallback() - box1.setMaterialName( "Simple/BumpyMetal" ) + box1.setMaterialName( "Examples/BumpyMetal" ) bod.setPositionOrientation( pos, orient ) @@ -67,7 +67,7 @@ floor = self.sceneManager.createEntity("Floor", "simple_terrain.mesh" ) floornode = self.sceneManager.getRootSceneNode().createChildSceneNode( "FloorNode" ) floornode.attachObject( floor ) - floor.setMaterialName( "Simple/BeachStones" ) + floor.setMaterialName( "Examples/DarkMaterial" ) floor.setCastShadows( False ) ## here's where we make a collision shape for the physics. note that we use the same size as @@ -193,7 +193,7 @@ node.setPosition(0.0, 0.0, 0.0) - ent.setMaterialName( "Simple/dirt01" ) + ent.setMaterialName( "Examples/RustySteel" ) ent.setNormaliseNormals(True) ## again, make the collision shape. Modified: trunk/python-ogre/demos/OgreNewt/Demo08_Ragdoll.py =================================================================== --- trunk/python-ogre/demos/OgreNewt/Demo08_Ragdoll.py 2007-09-17 13:50:07 UTC (rev 381) +++ trunk/python-ogre/demos/OgreNewt/Demo08_Ragdoll.py 2007-09-18 11:55:38 UTC (rev 382) @@ -44,7 +44,7 @@ floor = self.sceneManager.createEntity("Floor", "simple_terrain.mesh" ) floornode = self.sceneManager.getRootSceneNode().createChildSceneNode( "FloorNode" ) floornode.attachObject( floor ) - floor.setMaterialName( "Simple/BeachStones" ) + floor.setMaterialName( "Examples/DarkMaterial" ) floor.setCastShadows( False ) ##Ogre.Vector3 siz(100.0, 10.0, 100.0) @@ -165,7 +165,7 @@ node = self.sceneManager.getRootSceneNode().createChildSceneNode( name ) node.attachObject( ent ) - ent.setMaterialName( "Simple/dirt01" ) + ent.setMaterialName( "Examples/RustySteel" ) ent.setNormaliseNormals(True) @@ -222,13 +222,13 @@ self.K1 = True ## spawn the ragdoll. this is the version that is made up of simple primitives. - self.Ragdoll = RagDoll( "./zombie_rag_primitives.xml", self.World, self.RagNode ) + self.Ragdoll = RagDoll( "./Media/models/zombie_rag_primitives.xml", self.World, self.RagNode ) self.RagEntity.getAnimationState( "LOOP" ).setEnabled( False ) elif (self.Keyboard.isKeyDown(OIS.KC_2 ) and ( not self.K2)): self.K2 = True ## spawn the ragdoll. this is the version that uses auto-hull generation for very accurate collision shapes. - self.Ragdoll = RagDoll( "./zombie_rag_hull.xml", self.World, self.RagNode ) + self.Ragdoll = RagDoll( "./Media/models/zombie_rag_hull.xml", self.World, self.RagNode ) self.RagEntity.getAnimationState( "LOOP" ).setEnabled( False ) if ( not self.Keyboard.isKeyDown(OIS.KC_1 )): Modified: trunk/python-ogre/demos/OgreNewt/SimpleVehicle.py =================================================================== --- trunk/python-ogre/demos/OgreNewt/SimpleVehicle.py 2007-09-17 13:50:07 UTC (rev 381) +++ trunk/python-ogre/demos/OgreNewt/SimpleVehicle.py 2007-09-18 11:55:38 UTC (rev 382) @@ -46,7 +46,7 @@ bod.setMassMatrix( mass, inertia ) bod.setStandardForceCallback() - box1.setMaterialName( "Simple/BumpyMetal" ) + box1.setMaterialName( "Examples/BumpyMetal" ) box1.setNormaliseNormals(True) bod.setPositionOrientation( pos, orient ) Modified: trunk/python-ogre/demos/OgreNewt/resources.cfg =================================================================== --- trunk/python-ogre/demos/OgreNewt/resources.cfg 2007-09-17 13:50:07 UTC (rev 381) +++ trunk/python-ogre/demos/OgreNewt/resources.cfg 2007-09-18 11:55:38 UTC (rev 382) @@ -1,33 +1,28 @@ -#Zip=../Media/packs/OgreCore.zip +[Bootstrap] +Zip=../media/packs/OgreCore.zip # Resource locations to be added to the default path [General] -#FileSystem=../Media -FileSystem=../Media/fonts -#FileSystem=../Media/materials/programs -#FileSystem=../Media/materials/scripts -#FileSystem=../Media/materials/textures -#FileSystem=../Media/models -#FileSystem=../Media/overlays -#FileSystem=../Media/particle -FileSystem=../Media/gui -#FileSystem=../Media/DeferredShadingMedia -#Zip=../Media/packs/cubemap.zip -#Zip=../Media/packs/cubemapsJS.zip -#Zip=../Media/packs/dragon.zip -#Zip=../Media/packs/fresneldemo.zip -#Zip=../Media/packs/ogretestmap.zip -#Zip=../Media/packs/skybox.zip +FileSystem=../media +FileSystem=../media/fonts +FileSystem=../media/sounds +FileSystem=../media/Audio +FileSystem=../media/materials/programs +FileSystem=../media/materials/scripts +FileSystem=../media/materials/textures +FileSystem=../media/models +FileSystem=../media/overlays +FileSystem=../media/particle +FileSystem=../media/gui +Zip=../media/packs/cubemap.zip +Zip=../media/packs/cubemapsJS.zip +Zip=../media/packs/dragon.zip +Zip=../media/packs/fresneldemo.zip +Zip=../media/packs/ogretestmap.zip +Zip=../media/packs/skybox.zip -## for the ogrenewt demos -#FileSystem=../newtMedia/GUI/schemes -#FileSystem=../newtMedia/GUI/imagesets -#FileSystem=../newtMedia/GUI/fonts -#FileSystem=../newtMedia/fonts -FileSystem=../Media/newtMedia/materials/scripts -FileSystem=../media/newtMedia/materials/textures -FileSystem=../Media/newtMedia/models -FileSystem=../Media/newtMedia/primitives -Zip=../media/newtMedia/packs/OgreCore.zip -Zip=../media/newtMedia/packs/cubemapsJS.zip +FileSystem=./Media/materials/scripts +FileSystem=./Media/materials/textures +FileSystem=./Media/models +FileSystem=./Media/primitives Added: trunk/python-ogre/demos/media/DeferredShadingMedia/COPYING =================================================================== --- trunk/python-ogre/demos/media/DeferredShadingMedia/COPYING (rev 0) +++ trunk/python-ogre/demos/media/DeferredShadingMedia/COPYING 2007-09-18 11:55:38 UTC (rev 382) @@ -0,0 +1,36 @@ +Copyright (c) W.J. van der Laan + + + +Permission is hereby granted, free of charge, to any person obtaining a copy of + +this software and associated documentation files (the "Software"), to deal in + +the Software without restriction, including without limitation the rights to use, + +copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the + +Software, and to permit persons to whom the Software is furnished to do so, subject + +to the following conditions: + + + +The above copyright notice and this permission notice shall be included in all copies + +or substantial portions of the Software. + + + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, + +INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A + +PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + +HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,OUT OF OR IN CONNECTION WITH THE + +SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + Added: trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/material/glsl/nm_notex_ps.glsl =================================================================== --- trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/material/glsl/nm_notex_ps.glsl (rev 0) +++ trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/material/glsl/nm_notex_ps.glsl 2007-09-18 11:55:38 UTC (rev 382) @@ -0,0 +1,54 @@ +/****************************************************************************** +Copyright (c) W.J. van der Laan + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to use, +copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the +Software, and to permit persons to whom the Software is furnished to do so, subject +to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies +or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, +INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A +PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,OUT OF OR IN CONNECTION WITH THE +SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +******************************************************************************/ +/** Deferred shading framework + // W.J. :wumpus: van der Laan 2005 // + + Material shader: Single colour normal mapped +*/ + +#extension GL_ARB_draw_buffers : enable + +varying vec3 normal; +varying vec3 tangent_; +varying vec3 binormal; + +varying vec2 texCoord0; +varying float depth; + +uniform sampler2D normTex; + +uniform float specularity; +uniform vec3 colour; + +void main() +{ + // Frame for normal mapping + mat3 rotation = mat3(tangent_, binormal, normal); + vec3 texnormal = (vec3(texture2D(normTex, texCoord0))-0.5)*2.0; + + gl_FragData[0].rgb = colour; + gl_FragData[0].a = specularity; + // rotation*texnormal is reversed for GL because matrices are stored transposed internally + // compared to HLSL + gl_FragData[1].xyz = normalize(rotation*texnormal); // Do normalisation here, saves an operation per light + gl_FragData[1].w = depth; + +} Added: trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/material/glsl/nm_ps.glsl =================================================================== --- trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/material/glsl/nm_ps.glsl (rev 0) +++ trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/material/glsl/nm_ps.glsl 2007-09-18 11:55:38 UTC (rev 382) @@ -0,0 +1,52 @@ +/****************************************************************************** +Copyright (c) W.J. van der Laan + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to use, +copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the +Software, and to permit persons to whom the Software is furnished to do so, subject +to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies +or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, +INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A +PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,OUT OF OR IN CONNECTION WITH THE +SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +******************************************************************************/ +/** Deferred shading framework + // W.J. :wumpus: van der Laan 2005 // + + Material shader: Textured normal mapped +*/ + +#extension GL_ARB_draw_buffers : enable + +varying vec3 normal; +varying vec3 tangent_; +varying vec3 binormal; + +varying vec2 texCoord0; +varying float depth; +uniform sampler2D tex0; +uniform sampler2D normTex; + +uniform float specularity; + +void main() +{ + // Frame for normal mapping + mat3 rotation = mat3(tangent_, binormal, normal); + vec3 texnormal = (vec3(texture2D(normTex, texCoord0))-0.5)*2.0; + + gl_FragData[0].rgb = vec3(texture2D(tex0, texCoord0)); + gl_FragData[0].a = specularity; + // rotation*texnormal is reversed for GL because matrices are stored transposed internally + // compared to HLSL + gl_FragData[1].xyz = normalize(rotation*texnormal); // Do normalisation here, saves an operation per light + gl_FragData[1].w = depth; +} Added: trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/material/glsl/nm_vs.glsl =================================================================== --- trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/material/glsl/nm_vs.glsl (rev 0) +++ trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/material/glsl/nm_vs.glsl 2007-09-18 11:55:38 UTC (rev 382) @@ -0,0 +1,47 @@ +/****************************************************************************** +Copyright (c) W.J. van der Laan + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to use, +copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the +Software, and to permit persons to whom the Software is furnished to do so, subject +to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies +or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, +INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A +PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,OUT OF OR IN CONNECTION WITH THE +SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +******************************************************************************/ +/** Deferred shading framework + // W.J. :wumpus: van der Laan 2005 // + + Material shader: Normal mapped +*/ +varying vec3 normal; +varying vec3 tangent_; +varying vec3 binormal; + +varying vec2 texCoord0; +varying float depth; + +attribute vec3 tangent; + +void main() +{ + vec4 projPos = gl_ModelViewProjectionMatrix * gl_Vertex; + + gl_Position = projPos; + depth = projPos.w; + texCoord0 = vec2(gl_MultiTexCoord0); + + normal = vec3(gl_ModelViewMatrix*vec4(gl_Normal,0)); + tangent_ = vec3(gl_ModelViewMatrix*vec4(tangent,0)); + binormal = cross(normal, tangent_); + +} Added: trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/material/glsl/notex_ps.glsl =================================================================== --- trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/material/glsl/notex_ps.glsl (rev 0) +++ trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/material/glsl/notex_ps.glsl 2007-09-18 11:55:38 UTC (rev 382) @@ -0,0 +1,42 @@ +/****************************************************************************** +Copyright (c) W.J. van der Laan + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to use, +copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the +Software, and to permit persons to whom the Software is furnished to do so, subject +to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies +or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, +INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A +PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,OUT OF OR IN CONNECTION WITH THE +SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +******************************************************************************/ +/** Deferred shading framework + // W.J. :wumpus: van der Laan 2005 // + + Material shader: Single colour phong +*/ + +#extension GL_ARB_draw_buffers : enable + +varying vec3 normal; +varying vec2 texCoord0; +varying float depth; + +uniform float specularity; +uniform vec3 colour; + +void main() +{ + gl_FragData[0].rgb = colour; + gl_FragData[0].a = specularity; + gl_FragData[1].xyz = normalize(normal); // Do normalisation here, saves an operation per light + gl_FragData[1].w = depth; +} Added: trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/material/glsl/ps.glsl =================================================================== --- trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/material/glsl/ps.glsl (rev 0) +++ trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/material/glsl/ps.glsl 2007-09-18 11:55:38 UTC (rev 382) @@ -0,0 +1,42 @@ +/****************************************************************************** +Copyright (c) W.J. van der Laan + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to use, +copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the +Software, and to permit persons to whom the Software is furnished to do so, subject +to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies +or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, +INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A +PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,OUT OF OR IN CONNECTION WITH THE +SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +******************************************************************************/ +/** Deferred shading framework + // W.J. :wumpus: van der Laan 2005 // + + Material shader: Textured phongs +*/ + +#extension GL_ARB_draw_buffers : enable + +varying vec3 normal; +varying vec2 texCoord0; +varying float depth; + +uniform sampler2D Tex0; +uniform float specularity; + +void main() +{ + gl_FragData[0].rgb = vec3(texture2D(Tex0, texCoord0)); + gl_FragData[0].a = specularity; + gl_FragData[1].xyz = normalize(normal); // Do normalisation here, saves an operation per light + gl_FragData[1].w = depth; +} Added: trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/material/glsl/vs.glsl =================================================================== --- trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/material/glsl/vs.glsl (rev 0) +++ trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/material/glsl/vs.glsl 2007-09-18 11:55:38 UTC (rev 382) @@ -0,0 +1,80 @@ +/****************************************************************************** + +Copyright (c) W.J. van der Laan + + + +Permission is hereby granted, free of charge, to any person obtaining a copy of + +this software and associated documentation files (the "Software"), to deal in + +the Software without restriction, including without limitation the rights to use, + +copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the + +Software, and to permit persons to whom the Software is furnished to do so, subject + +to the following conditions: + + + +The above copyright notice and this permission notice shall be included in all copies + +or substantial portions of the Software. + + + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, + +INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A + +PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + +HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,OUT OF OR IN CONNECTION WITH THE + +SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +******************************************************************************/ + +/** Deferred shading framework + + // W.J. :wumpus: van der Laan 2005 // + + + + Material shader: Phong material vertex shader + +*/ + +varying vec3 normal; + +varying vec2 texCoord0; + +varying float depth; + + + +void main() + +{ + + + + vec4 projPos = gl_ModelViewProjectionMatrix * gl_Vertex; + + + + gl_Position = projPos; + + depth = projPos.w; + + texCoord0 = vec2(gl_MultiTexCoord0); + + + + normal = vec3(gl_ModelViewMatrix*vec4(gl_Normal,0)); + +} + Added: trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/material/hlsl/nm_notex_ps.hlsl =================================================================== --- trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/material/hlsl/nm_notex_ps.hlsl (rev 0) +++ trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/material/hlsl/nm_notex_ps.hlsl 2007-09-18 11:55:38 UTC (rev 382) @@ -0,0 +1,112 @@ +/****************************************************************************** + +Copyright (c) W.J. van der Laan + + + +Permission is hereby granted, free of charge, to any person obtaining a copy of + +this software and associated documentation files (the "Software"), to deal in + +the Software without restriction, including without limitation the rights to use, + +copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the + +Software, and to permit persons to whom the Software is furnished to do so, subject + +to the following conditions: + + + +The above copyright notice and this permission notice shall be included in all copies + +or substantial portions of the Software. + + + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, + +INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A + +PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + +HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,OUT OF OR IN CONNECTION WITH THE + +SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +******************************************************************************/ + +/** Deferred shading framework + + // W.J. :wumpus: van der Laan 2005 // + + + + Material shader: Single colour normal mapped + +*/ + +sampler Tex0: register(s0); + + + +struct OUTPUT + +{ + + float4 color0 : COLOR0; // Diffuse color + ? + + float4 color1 : COLOR1; // Normal + depth + +}; + + + +float3 colour; + +float specularity; + + + +OUTPUT main( + + float3 normal: TEXCOORD0, + + float4 texCoord0: TEXCOORD1, + + float depth: TEXCOORD2, + + float3 tangent: TEXCOORD3, + + float3 binormal: TEXCOORD4 + +) + +{ + + OUTPUT output; + + // Frame for normal mapping + + float3x3 rotation = float3x3(tangent, binormal, normal); + + float3 texnormal = (tex2D(Tex0, texCoord0)-0.5)*2; + + + + output.color0.rgb = colour; + + output.color0.a = specularity; + + output.color1.xyz = normalize(mul(texnormal,rotation)); // Do normalisation here, saves an operation per light + + output.color1.w = depth; + + + + return output; + +} + Added: trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/material/hlsl/nm_ps.hlsl =================================================================== --- trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/material/hlsl/nm_ps.hlsl (rev 0) +++ trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/material/hlsl/nm_ps.hlsl 2007-09-18 11:55:38 UTC (rev 382) @@ -0,0 +1,112 @@ +/****************************************************************************** + +Copyright (c) W.J. van der Laan + + + +Permission is hereby granted, free of charge, to any person obtaining a copy of + +this software and associated documentation files (the "Software"), to deal in + +the Software without restriction, including without limitation the rights to use, + +copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the + +Software, and to permit persons to whom the Software is furnished to do so, subject + +to the following conditions: + + + +The above copyright notice and this permission notice shall be included in all copies + +or substantial portions of the Software. + + + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, + +INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A + +PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + +HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,OUT OF OR IN CONNECTION WITH THE + +SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +******************************************************************************/ + +/** Deferred shading framework + + // W.J. :wumpus: van der Laan 2005 // + + + + Material shader: Textured normal mapped + +*/ + +sampler Tex0: register(s0); + +sampler Tex1: register(s1); + + + +struct OUTPUT + +{ + + float4 color0 : COLOR0; // Diffuse color + ? + + float4 color1 : COLOR1; // Normal + depth + +}; + + + +float specularity; + + + +OUTPUT main( + + float3 normal: TEXCOORD0, + + float4 texCoord0: TEXCOORD1, + + float depth: TEXCOORD2, + + float3 tangent: TEXCOORD3, + + float3 binormal: TEXCOORD4 + +) + +{ + + OUTPUT output; + + // Frame for normal mapping + + float3x3 rotation = float3x3(tangent, binormal, normal); + + float3 texnormal = (tex2D(Tex1, texCoord0)-0.5)*2; + + + + output.color0.rgb = tex2D(Tex0, texCoord0); + + output.color0.a = specularity; + + output.color1.xyz = normalize(mul(texnormal,rotation)); // Do normalisation here, saves an operation per light + + output.color1.w = depth; + + + + return output; + +} + Added: trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/material/hlsl/nm_vs.hlsl =================================================================== --- trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/material/hlsl/nm_vs.hlsl (rev 0) +++ trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/material/hlsl/nm_vs.hlsl 2007-09-18 11:55:38 UTC (rev 382) @@ -0,0 +1,61 @@ +/****************************************************************************** +Copyright (c) W.J. van der Laan + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, includin... [truncated message content] |