ruby-ogre 0.0.3-x86-linux → 0.0.4-x86-linux

Sign up to get free protection for your applications and to get access to all the features.
Files changed (105) hide show
  1. data/Rakefile +7 -8
  2. data/bindings/ogre/interface/ogre_all.i +1 -0
  3. data/bindings/ogre/interface/ogre_wrap.cpp +591 -46
  4. data/bindings/ogre/interface/ogre_wrap.o +0 -0
  5. data/bindings/ogrebites/interface/ogrebites_wrap.o +0 -0
  6. data/bindings/procedural/interface/procedural_wrap.o +0 -0
  7. data/deps/include/OGRE/OgreAny.h +23 -1
  8. data/deps/include/OGRE/OgreBillboardChain.h +5 -1
  9. data/deps/include/OGRE/OgreBillboardParticleRenderer.h +2 -0
  10. data/deps/include/OGRE/OgreConfigDialog.h +0 -2
  11. data/deps/include/OGRE/OgreDynLib.h +1 -7
  12. data/deps/include/OGRE/OgreErrorDialog.h +0 -2
  13. data/deps/include/OGRE/OgreHeaderSuffix.h +3 -3
  14. data/deps/include/OGRE/OgreInstanceBatch.h +4 -0
  15. data/deps/include/OGRE/OgreInstanceManager.h +5 -0
  16. data/deps/include/OGRE/OgreIteratorRange.h +13 -2
  17. data/deps/include/OGRE/OgreParticleSystem.h +2 -0
  18. data/deps/include/OGRE/OgreParticleSystemRenderer.h +4 -0
  19. data/deps/include/OGRE/OgrePlatform.h +5 -28
  20. data/deps/include/OGRE/OgrePrerequisites.h +1 -1
  21. data/deps/include/OGRE/OgreProfiler.h +102 -59
  22. data/deps/include/OGRE/OgreProgressiveMesh.h +2 -2
  23. data/deps/include/OGRE/OgreRenderSystem.h +18 -1
  24. data/deps/include/OGRE/OgreRoot.h +1 -1
  25. data/deps/include/OGRE/OgreSearchOps.h +0 -5
  26. data/deps/include/OGRE/OgreSimpleRenderable.h +1 -1
  27. data/deps/include/OGRE/OgreStdHeaders.h +2 -2
  28. data/deps/include/OGRE/OgreStringConverter.h +5 -0
  29. data/deps/include/OGRE/OgreTimer.h +1 -1
  30. data/deps/include/OGRE/OgreUTFString.h +0 -2
  31. data/deps/include/OGRE/OgreWindowEventUtilities.h +3 -1
  32. data/deps/include/OGRE/OgreWorkQueue.h +2 -2
  33. data/deps/include/OGRE/RTShaderSystem/OgreShaderCGProgramProcessor.h +5 -5
  34. data/deps/include/OGRE/RTShaderSystem/OgreShaderCGProgramWriter.h +17 -15
  35. data/deps/include/OGRE/RTShaderSystem/OgreShaderExDualQuaternionSkinning.h +3 -3
  36. data/deps/include/OGRE/RTShaderSystem/OgreShaderExHardwareSkinning.h +5 -4
  37. data/deps/include/OGRE/RTShaderSystem/OgreShaderExHardwareSkinningTechnique.h +3 -3
  38. data/deps/include/OGRE/RTShaderSystem/OgreShaderExIntegratedPSSM3.h +50 -32
  39. data/deps/include/OGRE/RTShaderSystem/OgreShaderExLayeredBlending.h +13 -9
  40. data/deps/include/OGRE/RTShaderSystem/OgreShaderExLinearSkinning.h +7 -7
  41. data/deps/include/OGRE/RTShaderSystem/OgreShaderExNormalMapLighting.h +149 -95
  42. data/deps/include/OGRE/RTShaderSystem/OgreShaderExPerPixelLighting.h +91 -59
  43. data/deps/include/OGRE/RTShaderSystem/OgreShaderExTextureAtlasSampler.h +14 -9
  44. data/deps/include/OGRE/RTShaderSystem/OgreShaderFFPColour.h +33 -24
  45. data/deps/include/OGRE/RTShaderSystem/OgreShaderFFPFog.h +44 -30
  46. data/deps/include/OGRE/RTShaderSystem/OgreShaderFFPLighting.h +70 -45
  47. data/deps/include/OGRE/RTShaderSystem/OgreShaderFFPRenderStateBuilder.h +11 -10
  48. data/deps/include/OGRE/RTShaderSystem/OgreShaderFFPTexturing.h +73 -64
  49. data/deps/include/OGRE/RTShaderSystem/OgreShaderFFPTransform.h +8 -8
  50. data/deps/include/OGRE/RTShaderSystem/OgreShaderFunction.h +42 -35
  51. data/deps/include/OGRE/RTShaderSystem/OgreShaderFunctionAtom.h +38 -32
  52. data/deps/include/OGRE/RTShaderSystem/OgreShaderGLSLESProgramProcessor.h +9 -8
  53. data/deps/include/OGRE/RTShaderSystem/OgreShaderGLSLESProgramWriter.h +45 -36
  54. data/deps/include/OGRE/RTShaderSystem/OgreShaderGLSLProgramProcessor.h +9 -8
  55. data/deps/include/OGRE/RTShaderSystem/OgreShaderGLSLProgramWriter.h +26 -20
  56. data/deps/include/OGRE/RTShaderSystem/OgreShaderGenerator.h +211 -160
  57. data/deps/include/OGRE/RTShaderSystem/OgreShaderHLSLProgramProcessor.h +5 -5
  58. data/deps/include/OGRE/RTShaderSystem/OgreShaderHLSLProgramWriter.h +17 -15
  59. data/deps/include/OGRE/RTShaderSystem/OgreShaderMaterialSerializerListener.h +5 -3
  60. data/deps/include/OGRE/RTShaderSystem/OgreShaderParameter.h +86 -73
  61. data/deps/include/OGRE/RTShaderSystem/OgreShaderProgram.h +36 -30
  62. data/deps/include/OGRE/RTShaderSystem/OgreShaderProgramManager.h +38 -31
  63. data/deps/include/OGRE/RTShaderSystem/OgreShaderProgramProcessor.h +54 -43
  64. data/deps/include/OGRE/RTShaderSystem/OgreShaderProgramSet.h +18 -14
  65. data/deps/include/OGRE/RTShaderSystem/OgreShaderProgramWriter.h +10 -10
  66. data/deps/include/OGRE/RTShaderSystem/OgreShaderRenderState.h +28 -23
  67. data/deps/include/OGRE/RTShaderSystem/OgreShaderScriptTranslator.h +2 -1
  68. data/deps/include/OGRE/RTShaderSystem/OgreShaderSubRenderState.h +35 -32
  69. data/deps/include/OGRE/RenderSystems/GL/GL/wglew.h +2 -2
  70. data/deps/include/OGRE/RenderSystems/GL/GL/wglext.h +2 -2
  71. data/deps/include/OGRE/RenderSystems/GL/OgreGLRenderSystem.h +10 -1
  72. data/deps/include/OGRE/RenderSystems/GL/OgreGLTextureManager.h +2 -0
  73. data/deps/include/OGRE/Sample.h +5 -0
  74. data/deps/include/OGRE/SampleContext.h +13 -3
  75. data/deps/lib/OGRE/Plugin_BSPSceneManager.so +0 -0
  76. data/deps/lib/OGRE/Plugin_BSPSceneManager.so.1.8.1 +0 -0
  77. data/deps/lib/OGRE/Plugin_CgProgramManager.so +0 -0
  78. data/deps/lib/OGRE/Plugin_CgProgramManager.so.1.8.1 +0 -0
  79. data/deps/lib/OGRE/Plugin_OctreeSceneManager.so +0 -0
  80. data/deps/lib/OGRE/Plugin_OctreeSceneManager.so.1.8.1 +0 -0
  81. data/deps/lib/OGRE/Plugin_OctreeZone.so +0 -0
  82. data/deps/lib/OGRE/Plugin_OctreeZone.so.1.8.1 +0 -0
  83. data/deps/lib/OGRE/Plugin_PCZSceneManager.so +0 -0
  84. data/deps/lib/OGRE/Plugin_PCZSceneManager.so.1.8.1 +0 -0
  85. data/deps/lib/OGRE/Plugin_ParticleFX.so +0 -0
  86. data/deps/lib/OGRE/Plugin_ParticleFX.so.1.8.1 +0 -0
  87. data/deps/lib/OGRE/RenderSystem_GL.so +0 -0
  88. data/deps/lib/OGRE/RenderSystem_GL.so.1.8.1 +0 -0
  89. data/deps/lib/libOgreMain.so +0 -0
  90. data/deps/lib/libOgreMain.so.1.8.1 +0 -0
  91. data/deps/lib/libOgrePaging.so +0 -0
  92. data/deps/lib/libOgrePaging.so.1.8.1 +0 -0
  93. data/deps/lib/libOgreProcedural.so +0 -0
  94. data/deps/lib/libOgreRTShaderSystem.so +0 -0
  95. data/deps/lib/libOgreRTShaderSystem.so.1.8.1 +0 -0
  96. data/deps/lib/libOgreTerrain.so +0 -0
  97. data/deps/lib/libOgreTerrain.so.1.8.1 +0 -0
  98. data/deps/share/OGRE/media/materials/programs/DiffuseOneTexture.glsles +17 -0
  99. data/deps/share/OGRE/media/packs/profiler.zip +0 -0
  100. data/lib/ogre.so +0 -0
  101. data/lib/ogrebites.so +0 -0
  102. data/lib/procedural.so +0 -0
  103. data/lib/version.rb +1 -1
  104. data/sample/charactor/sinbad.rb +8 -4
  105. metadata +16 -4
@@ -50,21 +50,21 @@ public:
50
50
  /** Class constructor.
51
51
  @param language The target shader language.
52
52
  */
53
- GLSLProgramWriter ();
53
+ GLSLProgramWriter();
54
54
 
55
55
  /** Class destructor */
56
- virtual ~GLSLProgramWriter ();
56
+ virtual ~GLSLProgramWriter();
57
57
 
58
58
 
59
59
  /**
60
60
  @see ProgramWriter::writeSourceCode.
61
61
  */
62
- virtual void writeSourceCode (std::ostream& os, Program* program);
62
+ virtual void writeSourceCode(std::ostream& os, Program* program);
63
63
 
64
64
  /**
65
65
  @see ProgramWriter::getTargetLanguage.
66
66
  */
67
- virtual const String& getTargetLanguage () const { return TargetLanguage; }
67
+ virtual const String& getTargetLanguage() const { return TargetLanguage; }
68
68
 
69
69
  static String TargetLanguage;
70
70
 
@@ -73,35 +73,41 @@ public:
73
73
  protected:
74
74
 
75
75
  /** Initialize string maps. */
76
- void initializeStringMaps ();
76
+ void initializeStringMaps();
77
77
 
78
78
  /** Write a local parameter. */
79
- void writeLocalParameter (std::ostream& os, ParameterPtr parameter);
79
+ void writeLocalParameter(std::ostream& os, ParameterPtr parameter);
80
80
 
81
81
  /** Write forward declarations. This is needed so that we can attach library shader at a later step. */
82
- void writeForwardDeclarations (std::ostream& os, Program* program);
82
+ void writeForwardDeclarations(std::ostream& os, Program* program);
83
83
 
84
84
  /** Write the input params of the function */
85
- void writeInputParameters (std::ostream& os, Function* function, GpuProgramType gpuType);
85
+ void writeInputParameters(std::ostream& os, Function* function, GpuProgramType gpuType);
86
86
 
87
87
  /** Write the output params of the function */
88
- void writeOutParameters (std::ostream& os, Function* function, GpuProgramType gpuType);
88
+ void writeOutParameters(std::ostream& os, Function* function, GpuProgramType gpuType);
89
89
 
90
90
  protected:
91
- typedef std::map<GpuConstantType, const char*> GpuConstTypeToStringMap;
92
- typedef std::map<Parameter::Semantic, const char*> ParamSemanticToStringMap;
93
- typedef std::map<Parameter::Content, const char*> ParamContentToStringMap;
94
- typedef std::map<String, String> StringMap;
91
+ typedef std::map<GpuConstantType, const char*> GpuConstTypeToStringMap;
92
+ typedef std::map<Parameter::Semantic, const char*> ParamSemanticToStringMap;
93
+ typedef std::map<Parameter::Content, const char*> ParamContentToStringMap;
94
+ typedef std::map<String, String> StringMap;
95
95
 
96
96
  // Attributes.
97
97
  protected:
98
- GpuConstTypeToStringMap mGpuConstTypeMap; // Map between GPU constant type to string value.
99
- ParamSemanticToStringMap mParamSemanticMap; // Map between parameter semantic to string value.
100
-
101
- StringMap mInputToGLStatesMap; // Map parameter name to a new parameter name (sometime renaming is required to match names between vertex and fragment shader)
102
- ParamContentToStringMap mContentToPerVertexAttributes; // Map parameter content to vertex attributes
103
- int mGLSLVersion; // Holds the current glsl version
104
- StringVector mFragInputParams; // Holds the fragment input params
98
+ // Map between GPU constant type to string value.
99
+ GpuConstTypeToStringMap mGpuConstTypeMap;
100
+ // Map between parameter semantic to string value.
101
+ ParamSemanticToStringMap mParamSemanticMap;
102
+
103
+ // Map parameter name to a new parameter name (sometime renaming is required to match names between vertex and fragment shader)
104
+ StringMap mInputToGLStatesMap;
105
+ // Map parameter content to vertex attributes
106
+ ParamContentToStringMap mContentToPerVertexAttributes;
107
+ // Holds the current glsl version
108
+ int mGLSLVersion;
109
+ // Holds the fragment input params
110
+ StringVector mFragInputParams;
105
111
  };
106
112
 
107
113
  /** GLSL program writer factory implementation.