[Python-ogre-commit] SF.net SVN: python-ogre: [596] trunk/python-ogre
Brought to you by:
andy_miller,
roman_yakovenko
Menu
▾
▴
[Python-ogre-commit] SF.net SVN: python-ogre: [596] trunk/python-ogre
|
From: <and...@us...> - 2008-06-17 04:38:16
|
Revision: 596
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=596&view=rev
Author: andy_miller
Date: 2008-06-16 21:38:24 -0700 (Mon, 16 Jun 2008)
Log Message:
-----------
Updates to media for ogre 1.7
Buttet 2.69 support
Working on Dshow module
Modified Paths:
--------------
trunk/python-ogre/PythonOgreConfig_nt.py
trunk/python-ogre/ThirdParty/ffmpeg/videoPlayer.cpp
trunk/python-ogre/ThirdParty/ffmpeg/videoPlayer.h
trunk/python-ogre/code_generators/bullet/generate_code.py
trunk/python-ogre/code_generators/bullet/python_bullet_aliases.h
trunk/python-ogre/code_generators/ogreforests/generate_code.py
trunk/python-ogre/demos/media/DeferredShadingMedia/COPYING
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/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/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/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/read_me.html
trunk/python-ogre/demos/media/fonts/sample.fontdef
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/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/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/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/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/chiropteraDM.txt
trunk/python-ogre/demos/media/packs/fresneldemo.zip
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
trunk/python-ogre/demos/particleuniverse/media/ParticleUniverse/material/pu_explosion.material
trunk/python-ogre/demos/particleuniverse/media/ParticleUniverse/scripts/pu_example_11_20.pu
trunk/python-ogre/demos/particleuniverse/media/ParticleUniverse/scripts/pu_example_21_30.pu
trunk/python-ogre/demos/particleuniverse/media/ParticleUniverse/scripts/pu_flame.pu
trunk/python-ogre/demos/particleuniverse/media/ParticleUniverse/scripts/pu_rain.pu
trunk/python-ogre/environment.py
Added Paths:
-----------
trunk/python-ogre/demos/media/PCZAppMedia/
trunk/python-ogre/demos/media/PCZAppMedia/Carpet_Diamond_Olive.jpg
trunk/python-ogre/demos/media/PCZAppMedia/Metal_Brass_Ceiling.jpg
trunk/python-ogre/demos/media/PCZAppMedia/Metal_Embossed.jpg
trunk/python-ogre/demos/media/PCZAppMedia/Metal_Rusted.jpg
trunk/python-ogre/demos/media/PCZAppMedia/Metal_Rusted1.jpg
trunk/python-ogre/demos/media/PCZAppMedia/Metal_Steel_Textured.jpg
trunk/python-ogre/demos/media/PCZAppMedia/Metal_Steel_Textured_White.jpg
trunk/python-ogre/demos/media/PCZAppMedia/ROOM.material
trunk/python-ogre/demos/media/PCZAppMedia/ROOM_NX.mesh
trunk/python-ogre/demos/media/PCZAppMedia/ROOM_NY.mesh
trunk/python-ogre/demos/media/PCZAppMedia/ROOM_NZ.mesh
trunk/python-ogre/demos/media/PCZAppMedia/ROOM_PX.mesh
trunk/python-ogre/demos/media/PCZAppMedia/ROOM_PY.mesh
trunk/python-ogre/demos/media/PCZAppMedia/ROOM_PZ.mesh
trunk/python-ogre/demos/media/PCZAppMedia/Roofing_Tile_Spanish.jpg
trunk/python-ogre/demos/media/PCZAppMedia/Translucent_Glass_Tinted.jpg
trunk/python-ogre/demos/media/PCZAppMedia/Translucent_Glass_Tinted1.jpg
trunk/python-ogre/demos/media/PCZAppMedia/Wood_Floor.jpg
trunk/python-ogre/demos/media/PCZAppMedia/building_exterior.mesh
trunk/python-ogre/demos/media/PCZAppMedia/room_nxnynz.mesh
trunk/python-ogre/demos/media/PCZAppMedia/room_nxpx.mesh
trunk/python-ogre/demos/media/PCZAppMedia/room_nxpxnypynzpz.mesh
trunk/python-ogre/demos/media/PCZAppMedia/room_nxpxnz.mesh
trunk/python-ogre/demos/media/PCZAppMedia/room_nxpxnzpz.mesh
trunk/python-ogre/demos/media/PCZAppMedia/room_nxpxpz.mesh
trunk/python-ogre/demos/media/PCZAppMedia/room_nxpynz.mesh
trunk/python-ogre/demos/media/PCZAppMedia/room_nxpz.mesh
trunk/python-ogre/demos/media/PCZAppMedia/room_nypy.mesh
trunk/python-ogre/demos/media/PCZAppMedia/room_nypy_4y.mesh
trunk/python-ogre/demos/media/PCZAppMedia/room_nzpz.mesh
trunk/python-ogre/demos/media/PCZAppMedia/room_pxnynz.mesh
trunk/python-ogre/demos/media/PCZAppMedia/room_pxpynz.mesh
trunk/python-ogre/demos/media/PCZAppMedia/room_pxpz.mesh
trunk/python-ogre/demos/media/PCZAppMedia/terrain.png
trunk/python-ogre/demos/media/PCZAppMedia/terrain2.cfg
trunk/python-ogre/demos/media/PCZAppMedia/terrain2.png
Removed Paths:
-------------
trunk/python-ogre/ThirdParty/extra/include/ffmpeg/
trunk/python-ogre/packages_2.5/ogre/renderer/OGREdshow/
Modified: trunk/python-ogre/PythonOgreConfig_nt.py
===================================================================
--- trunk/python-ogre/PythonOgreConfig_nt.py 2008-06-15 10:03:54 UTC (rev 595)
+++ trunk/python-ogre/PythonOgreConfig_nt.py 2008-06-17 04:38:24 UTC (rev 596)
@@ -111,7 +111,9 @@
PATH_LIB_Bullet = os.path.join(PATH_Bullet, 'out/release8/libs' )
PATH_LIB_Theora= os.path.join(PATH_Theora, 'bin', 'Release')
PATH_LIB_ogrevideoffmpeg = PATH_ogrevideoffmpeg
-PATH_LIB_ffmpeg= os.path.join(BASE_DIR, 'ffmpeg', 'lib')
+# PATH_LIB_ffmpeg= os.path.join(BASE_DIR, 'ffmpeg', 'lib')
+PATH_LIB_ffmpeg= os.path.join(PATH_ffmpeg, 'lib')
+
PATH_LIB_plib = PATH_plib
PATH_LIB_navi= os.path.join(PATH_navi, 'lib')
PATH_LIB_ogredshow = PATH_ogredshow
@@ -169,7 +171,7 @@
PATH_INCLUDE_OggVorbisTheora = [ os.path.join(BASE_DIR,'ogg','include')
,os.path.join(BASE_DIR, 'vorbis', 'include')
- ,os.path.join(BASE_DIR, 'libtheora-1.0beta2', 'include')
+ ,os.path.join(BASE_DIR, 'theora', 'include')
# ,os.path.join(PATH_OgreAddons,'videoplugin','theoravideo','include')
# ,os.path.join(PATH_OgreAddons,'videoplugin','ptypes-2.1.1','include')
,os.path.join(PATH_THIRDPARTY,'ptypes','include')
Modified: trunk/python-ogre/ThirdParty/ffmpeg/videoPlayer.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/ffmpeg/videoPlayer.cpp 2008-06-15 10:03:54 UTC (rev 595)
+++ trunk/python-ogre/ThirdParty/ffmpeg/videoPlayer.cpp 2008-06-17 04:38:24 UTC (rev 596)
@@ -222,12 +222,35 @@
bool cVideoPlayer::refresh(unsigned long time)
{
+ static struct SwsContext *img_convert_ctx;
+
if (state == playing)
{
if (time - lastTime > (SecondsPerFrame*1000))
{
+
if (GetNextFrame(FormatCtx, CodecCtx, VideoStream, Frame))
{
+
+// // // Convert the image into YUV format that SDL uses
+// // if(img_convert_ctx == NULL) {
+// // int w = is->video_st->codec->width;
+// // int h = is->video_st->codec->height;
+// // img_convert_ctx = sws_getContext(w, h,
+// // is->video_st->codec->pix_fmt,
+// // w, h, dst_pix_fmt, SWS_BICUBIC,
+// // NULL, NULL, NULL);
+// // if(img_convert_ctx == NULL) {
+// // fprintf(stderr, "Cannot initialize the conversion context!\n");
+// // exit(1);
+// // }
+// // }
+// // sws_scale(img_convert_ctx, pFrame->data,
+// // pFrame->linesize, 0,
+// // is->video_st->codec->height,
+// // pict.data, pict.linesize);
+
+
img_convert((AVPicture *)FrameRGB, PIX_FMT_RGB32, (AVPicture*)Frame,
CodecCtx->pix_fmt, CodecCtx->width, CodecCtx->height);
Modified: trunk/python-ogre/ThirdParty/ffmpeg/videoPlayer.h
===================================================================
--- trunk/python-ogre/ThirdParty/ffmpeg/videoPlayer.h 2008-06-15 10:03:54 UTC (rev 595)
+++ trunk/python-ogre/ThirdParty/ffmpeg/videoPlayer.h 2008-06-17 04:38:24 UTC (rev 596)
@@ -10,8 +10,8 @@
extern "C" {
#define __STDC_CONSTANT_MACROS
#define __STDC_LIMIT_MACROS
-#include <ffmpeg/avformat.h>
-#include <ffmpeg/avcodec.h>
+#include <libavformat/avformat.h>
+#include <libavcodec/avcodec.h>
}
using namespace Ogre;
Modified: trunk/python-ogre/code_generators/bullet/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/bullet/generate_code.py 2008-06-15 10:03:54 UTC (rev 595)
+++ trunk/python-ogre/code_generators/bullet/generate_code.py 2008-06-17 04:38:24 UTC (rev 596)
@@ -92,6 +92,8 @@
,'::btDispatcher::getInternalManifoldPointer'
,'::btAxisSweep3Internal<unsigned int>::processAllOverlappingPairs'
,'::btAxisSweep3Internal<unsigned short>::processAllOverlappingPairs'
+ ,'::btMultiSapBroadphase::createProxy'
+ ,'::btMultiSapBroadphase::quicksort'
]
@@ -110,12 +112,40 @@
,'btAlignedAllocator<btPersistentManifold*, 16u>'
,'btAlignedAllocator<btTypedConstraint*, 16u>'
,'btAlignedAllocator<btRaycastVehicle*, 16u>'
+ ,'btAlignedAllocator<btBroadphaseInterface*, 16u>'
+ ,'btAlignedAllocator<btDbvt::Node const*, 16u>'
+# ,'btAlignedObjectArray<short>'
+# ,'btAlignedAllocator<btDbvt::sStkNN, 16u>'
+# ,'btAlignedAllocator<btDbvt::sStkNP, 16u>'
+# ,'btAlignedAllocator<btDbvt::sStkNPS, 16u>'
+ ,'btAlignedAllocator<btMultiSapBroadphase::btBridgeProxy*, 16u>'
+ ,'btAlignedAllocator<btMultiSapBroadphase::btMultiSapProxy*, 16u>'
+# ,'btAlignedAllocator<btOdeContactJoint, 16u>'
+ ,'btAlignedAllocator<btOdeJoint*, 16u>'
+# ,'btAlignedAllocator<btOdeSolverBody, 16u>'
+ ,'btAlignedAllocator<btOdeSolverBody*, 16u>'
+# ,'btAlignedAllocator<btOdeTypedJoint, 16u>'
+ ,'btAlignedAllocator<short, 16u>'
+# ,'btAlignedObjectArray<btDbvt::Node const*>'
+# ,'btAlignedObjectArray<btDbvt::sStkNN>'
+# ,'btAlignedObjectArray<btDbvt::sStkNP>'
+# ,'btAlignedObjectArray<btDbvt::sStkNPS>'
+ ,'btAlignedObjectArray<btMultiSapBroadphase::btBridgeProxy*>'
+ ,'btAlignedObjectArray<btMultiSapBroadphase::btMultiSapProxy*>'
+# ,'btAlignedObjectArray<btOdeContactJoint>'
+# ,'btAlignedObjectArray<btOdeJoint*>'
+# ,'btAlignedObjectArray<btOdeSolverBody>'
+# ,'btAlignedObjectArray<btOdeSolverBody*>'
+# ,'btAlignedObjectArray<btOdeTypedJoint>'
+
# ,'btAlignedObjectArray<btIndexedMesh>'
# ,'btAlignedObjectArray<int>'
# ,'btAlignedObjectArray<btQuantizedBvhNode>'
# ,'btAlignedObjectArray<btOptimizedBvhNode>'
# ,'btAlignedObjectArray<btCollisionObject*>'
+ ,'btDbvtBroadphase'
+ ,'btSorLcpSolver'
]
for e in excludes:
print "excluding class", e
@@ -310,7 +340,7 @@
os.path.join( environment.bullet.root_dir, "python_bullet.h" )
, environment.bullet.cache_file )
- defined_symbols = [ 'BULLET_EXPORTS', 'BT_DECLARE_ALIGNED_ALLOCATOR()' ]
+ defined_symbols = [ 'BULLET_EXPORTS', '__GCCXML__' ]
defined_symbols.append( 'VERSION_' + environment.bullet.version )
#
Modified: trunk/python-ogre/code_generators/bullet/python_bullet_aliases.h
===================================================================
--- trunk/python-ogre/code_generators/bullet/python_bullet_aliases.h 2008-06-15 10:03:54 UTC (rev 595)
+++ trunk/python-ogre/code_generators/bullet/python_bullet_aliases.h 2008-06-17 04:38:24 UTC (rev 596)
@@ -22,7 +22,36 @@
typedef btAlignedAllocator<btBvhSubtreeInfo, 16> BvhSubtreeInfo16;
typedef btAlignedAllocator<btQuantizedBvhNode, 16> QuantizedBvhNode16;
typedef btAlignedAllocator<btOptimizedBvhNode, 16> OptimizedBvhNode16;
+typedef btAlignedAllocator<btBroadphaseInterface*, 16> BroadphaseInterfacePtr16;
+// new changes
+typedef btAlignedAllocator<btDbvt::Node const*, 16u> AlignedAllocatorDbvtNode;
+typedef btAlignedObjectArray<short> AlignedObjectArrayShort;
+typedef btAlignedAllocator<btDbvt::sStkNN, 16u> AlignedAllocatorsStkNN;
+typedef btAlignedAllocator<btDbvt::sStkNP, 16u> AlignedAllocatorsStkNP;
+typedef btAlignedAllocator<btDbvt::sStkNPS, 16u> AlignedAllocatorsStkNPS;
+// typedef btAlignedAllocator<btMultiSapBroadphase::btBridgeProxy*, 16u> AlignedAllocatorMultiSapBradBridge;
+// typedef btAlignedAllocator<btMultiSapBroadphase::btMultiSapProxy*, 16u> AlignedAllocatorMultiSapBroadMulti;
+typedef btAlignedAllocator<btOdeContactJoint, 16u> AlignedAllocatorOdeContactJoint;
+typedef btAlignedAllocator<btOdeJoint*, 16u> AlignedAllocatorOdeJointPtr;
+typedef btAlignedAllocator<btOdeSolverBody, 16u> AlignedAllocatorOdeSolverBody;
+typedef btAlignedAllocator<btOdeSolverBody*, 16u> AlignedAllocatorOdeSolverBodyPtr;
+typedef btAlignedAllocator<btOdeTypedJoint, 16u> AlignedAllocatorOdeTypedJoint;
+typedef btAlignedAllocator<short, 16u> AlignedAllocatorShort16;
+typedef btAlignedObjectArray<btDbvt::Node const*> AlignedObjectArrayDbvtNode;
+typedef btAlignedObjectArray<btDbvt::sStkNN> AlignedObjectArrayDbvtsStkNN;
+typedef btAlignedObjectArray<btDbvt::sStkNP> AlignedObjectArrayDbvtsStkNP;
+typedef btAlignedObjectArray<btDbvt::sStkNPS> AlignedObjectArrayDbvtsStkNPS;
+// typedef btAlignedObjectArray<btMultiSapBroadphase::btBridgeProxy*> AlignedObjectArrayMultiSapBroadBridge;
+// typedef btAlignedObjectArray<btMultiSapBroadphase::btMultiSapProxy*> AlignedObjectArrayMultiSapBroadMulti;
+typedef btAlignedObjectArray<btOdeContactJoint> AlignedObjectArrayOdeContactJoint;
+typedef btAlignedObjectArray<btOdeJoint*> AlignedObjectArrayOdeJointPtr;
+typedef btAlignedObjectArray<btOdeSolverBody> AlignedObjectArrayOdeSolverBody;
+typedef btAlignedObjectArray<btOdeSolverBody*> AlignedObjectArrayOdeSolverBodyPtr;
+typedef btAlignedObjectArray<btOdeTypedJoint> AlignedObjectArrayOdeTypedJoint;
+
+
+
typedef btAlignedAllocator<btSolverConstraint, 16u> SolverConstraint16u;
typedef btAlignedAllocator<btSolverBody, 16u> SolverBody16u;
typedef btAlignedObjectArray<btSolverConstraint> AlignedObjectArraySolverConstraint;
Modified: trunk/python-ogre/code_generators/ogreforests/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/ogreforests/generate_code.py 2008-06-15 10:03:54 UTC (rev 595)
+++ trunk/python-ogre/code_generators/ogreforests/generate_code.py 2008-06-17 04:38:24 UTC (rev 596)
@@ -131,7 +131,8 @@
main_ns = global_ns.namespace( MAIN_NAMESPACE )
else:
main_ns = global_ns
-
+ main_ns.class_("::PagedGeometry::ImpostorTexture").noncopyable = True
+
############################################################
##
## And things that need to have their argument and call values fixed.
Modified: trunk/python-ogre/demos/media/DeferredShadingMedia/COPYING
===================================================================
--- trunk/python-ogre/demos/media/DeferredShadingMedia/COPYING 2008-06-15 10:03:54 UTC (rev 595)
+++ trunk/python-ogre/demos/media/DeferredShadingMedia/COPYING 2008-06-17 04:38:24 UTC (rev 596)
@@ -1,36 +1,18 @@
-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.
-
+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.
Modified: 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 2008-06-15 10:03:54 UTC (rev 595)
+++ trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/material/glsl/nm_notex_ps.glsl 2008-06-17 04:38:24 UTC (rev 596)
@@ -1,54 +1,46 @@
-/******************************************************************************
-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;
-
-}
+/******************************************************************************
+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
+*/
+
+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;
+}
Modified: trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/material/glsl/nm_ps.glsl
===================================================================
--- trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/material/glsl/nm_ps.glsl 2008-06-15 10:03:54 UTC (rev 595)
+++ trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/material/glsl/nm_ps.glsl 2008-06-17 04:38:24 UTC (rev 596)
@@ -1,52 +1,44 @@
-/******************************************************************************
-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;
-}
+/******************************************************************************
+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
+*/
+
+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;
+}
Modified: trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/material/glsl/nm_vs.glsl
===================================================================
--- trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/material/glsl/nm_vs.glsl 2008-06-15 10:03:54 UTC (rev 595)
+++ trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/material/glsl/nm_vs.glsl 2008-06-17 04:38:24 UTC (rev 596)
@@ -1,47 +1,41 @@
-/******************************************************************************
-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_);
-
-}
+/******************************************************************************
+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_);
+
+}
Modified: trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/material/glsl/notex_ps.glsl
===================================================================
--- trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/material/glsl/notex_ps.glsl 2008-06-15 10:03:54 UTC (rev 595)
+++ trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/material/glsl/notex_ps.glsl 2008-06-17 04:38:24 UTC (rev 596)
@@ -1,42 +1,35 @@
-/******************************************************************************
-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;
-}
+/******************************************************************************
+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
+*/
+
+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;
+}
Modified: trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/material/glsl/ps.glsl
===================================================================
--- trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/material/glsl/ps.glsl 2008-06-15 10:03:54 UTC (rev 595)
+++ trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/material/glsl/ps.glsl 2008-06-17 04:38:24 UTC (rev 596)
@@ -1,42 +1,37 @@
-/******************************************************************************
-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;
-}
+/******************************************************************************
+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
+*/
+
+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;
+}
Modified: trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/material/glsl/vs.glsl
===================================================================
--- trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/material/glsl/vs.glsl 2008-06-15 10:03:54 UTC (rev 595)
+++ trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/material/glsl/vs.glsl 2008-06-17 04:38:24 UTC (rev 596)
@@ -1,80 +1,39 @@
-/******************************************************************************
-
-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));
-
-}
-
+/******************************************************************************
+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));
+}
Modified: 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 2008-06-15 10:03:54 UTC (rev 595)
+++ trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/material/hlsl/nm_notex_ps.hlsl 2008-06-17 04:38:24 UTC (rev 596)
@@ -1,112 +1,56 @@
-/******************************************************************************
-
-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;
-
-}
-
+/******************************************************************************
+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;
+ out...
[truncated message content] |
