BearishSun 9 лет назад
Родитель
Сommit
cde0fbf269
29 измененных файлов с 61 добавлено и 58 удалено
  1. 4 2
      Documentation/Manuals/Native/gpuPrograms.md
  2. 8 7
      Documentation/Manuals/Native/renderAPI.md
  3. 1 1
      Source/BansheeCore/Include/BsAnimationCurve.h
  4. 4 4
      Source/BansheeCore/Include/BsMesh.h
  5. 4 4
      Source/BansheeCore/Include/BsMeshManager.h
  6. 5 5
      Source/BansheeCore/Include/BsRenderAPI.h
  7. 2 2
      Source/BansheeD3D11RenderAPI/Include/BsD3D11RenderAPI.h
  8. 2 2
      Source/BansheeD3D9RenderAPI/Include/BsD3D9RenderAPI.h
  9. 1 1
      Source/BansheeEditor/Include/BsGUIColor.h
  10. 1 1
      Source/BansheeEngine/Include/BsGUIButtonBase.h
  11. 1 1
      Source/BansheeEngine/Include/BsGUICanvas.h
  12. 1 1
      Source/BansheeEngine/Include/BsGUIElement.h
  13. 1 1
      Source/BansheeEngine/Include/BsGUIElementContainer.h
  14. 1 1
      Source/BansheeEngine/Include/BsGUIInputBox.h
  15. 1 1
      Source/BansheeEngine/Include/BsGUILabel.h
  16. 1 1
      Source/BansheeEngine/Include/BsGUIScrollBar.h
  17. 1 1
      Source/BansheeEngine/Include/BsGUISliderHandle.h
  18. 1 1
      Source/BansheeEngine/Include/BsGUITexture.h
  19. 1 1
      Source/BansheeEngine/Include/BsGUIViewport.h
  20. 1 1
      Source/BansheeFMOD/Include/BsFMODAudio.h
  21. 1 1
      Source/BansheeFMOD/Include/BsFMODAudioClip.h
  22. 1 1
      Source/BansheeFMOD/Include/BsFMODAudioSource.h
  23. 2 2
      Source/BansheeGLRenderAPI/Include/BsGLRenderAPI.h
  24. 4 4
      Source/BansheeOpenAudio/Include/BsFLACDecoder.h
  25. 1 1
      Source/BansheeOpenAudio/Include/BsOAAudio.h
  26. 1 1
      Source/BansheeOpenAudio/Include/BsOAAudioClip.h
  27. 1 1
      Source/BansheeOpenAudio/Include/BsOAAudioSource.h
  28. 4 4
      Source/BansheeOpenAudio/Include/BsOggVorbisDecoder.h
  29. 4 4
      Source/BansheeOpenAudio/Include/BsWaveDecoder.h

+ 4 - 2
Documentation/Manuals/Native/gpuPrograms.md

@@ -57,9 +57,11 @@ As you can see we must first retrieve a handle to the parameter, and then we can
 # Using GPU programs for rendering {#gpuPrograms_c}
 You can bind a GPU program to the pipeline by calling @ref BansheeEngine::RenderAPI::bindGpuProgram "RenderAPI::bindGpuProgram". Any draw calls following this bind will use the bound GPU program. You can unbind a program by calling @ref BansheeEngine::RenderAPI::unbindGpuProgram "RenderAPI::unbindGpuProgram".
 
-You can bind parameters by calling @ref BansheeEngine::RenderAPI::setGpuParams "RenderAPI::setGpuParams" and providing them with the GPU program type and a @ref BansheeEngine::GpuParams "GpuParams" object which you previously populated with parameter values.
+You can bind parameters for use in the GPU program by calling @ref BansheeEngine::RenderAPICore::setParamBuffer "RenderAPICore::setParamBuffer" for primitive parameters (vector, float, etc.) organized as @ref BansheeEngine::GpuParamBlockBuffer "GpuParamBlockBuffer", and @ref BansheeEngine::RenderAPICore::setTexture "RenderAPICore::setTexture", @ref BansheeEngine::RenderAPICore::setLoadStoreTexture "RenderAPICore::setLoadStoreTexture", @ref BansheeEngine::RenderAPICore::setBuffer "RenderAPICore::setBuffer", @ref BansheeEngine::RenderAPICore::setSamplerState "RenderAPICore::setSamplerState" for textures, buffers and sampler states.
 
-Optionally you can also call @ref BansheeEngine::RenderAPI::setConstantBuffers "RenderAPI::setConstantBuffers" using the same parameters, which will only set the primitive parameters (vectors, floats, etc.) but not textures/samplers/buffers. Sometimes this is useful if you want to set textures/samplers/buffers manually.
+You can retrieve the primitive parameter buffer from a @ref BansheeEngine::Material "Material" by calling @ref BansheeEngine::Material::getParamBuffer "Material::getParamBuffer", or by manually creating and populating one.
+
+Alternatively you can use the helper method @ref BansheeEngine::RendererUtility::setGpuParams "RendererUtility::setGpuParams" which will bind both object and data parameters in the @ref BansheeEngine::GpuParams "BansheeEngine::GpuParams" object.
 
 To learn more about the render API read the [manual](@ref renderAPI).
 

+ 8 - 7
Documentation/Manuals/Native/renderAPI.md

@@ -128,9 +128,13 @@ rapi.setSamplerState(GPT_FRAGMENT_PROGRAM, 0, mySamplerState);
 ~~~~~~~~~~~~~
 
 ### Data parameters {#renderAPI_c_a_b}
-Data parameters are bound to calling @ref BansheeEngine::RenderAPICore::setConstantBuffers "RenderAPICore::setConstantBuffers". You can only bind all data parameters at once. [GPU program](@ref gpuPrograms) manual has a lot more information about GPU parameters.
+Data parameters are bound to calling @ref BansheeEngine::RenderAPICore::setParamBuffer "RenderAPICore::setParamBuffer". You can manually populate the parameter buffer with required values, but generally you should use either @ref BansheeEngine::GpuParamsCore "GpuParamsCore" or @ref BansheeEngine::MaterialCore "MaterialCore" to set the parameters and then retrieve the existing parameter buffer.
 
-Optionally you can call @ref BansheeEngine::RenderAPICore::setGpuParams "RenderAPICore::setGpuParams" which will bind both object and data parameters in the @ref BansheeEngine::GpuParamsCore "BansheeEngine::GpuParamsCore" object.
+Each buffer need to be bound to a specific slot, and these slots can be read from the @ref BansheeEngine::GpuParamDesc "GpuParamDesc" structure accessible from @ref BansheeEngine::GpuProgramCore::getParamDesc "GpuProgramCore::getParamDesc". [GPU program](@ref gpuPrograms) manual has more information about GPU parameters.
+
+Alternatively you can call @ref BansheeEngine::RendererUtility::setGpuParams "RendererUtility::setGpuParams" helper method which will bind both object and data parameters in the @ref BansheeEngine::GpuParamsCore "BansheeEngine::GpuParamsCore" object.
+
+You can also call @ref BansheeEngine::RendererUtility::setPassParams "RendererUtility::setPassParams" to bind parameters for all GPU programs in a specific @ref BansheeEngine::MaterialCore "MaterialCore" pass.
 
 For example:
 ~~~~~~~~~~~~~{.cpp}
@@ -138,13 +142,10 @@ SPtr<GpuProgramCore> program = ...;
 SPtr<GpuParamsCore> params = program->createParameters();
 
 ... set param values ...
-
-RenderAPICore& rapi = RenderAPICore::instance();
-
 ... bind GPU program ...
 
-// Set all data parameters for the currently bound fragment program
-rapi.setConstantBuffers(GPT_FRAGMENT_PROGRAM, params);
+// Set all parameters for the currently bound fragment program
+gRendererUtility().setGpuParams(GPT_FRAGMENT_PROGRAM, params);
 
 ... execute some draw calls ...
 

+ 1 - 1
Source/BansheeCore/Include/BsAnimationCurve.h

@@ -40,7 +40,7 @@ namespace BansheeEngine
 		 * order using the non-caching version of evaluate() might yield better performance.
 		 *
 		 * @param[in]	time			Time to evaluate the curve at.
-		 * @param[i]	cache			Cached data from previous requests that can be used for speeding up sequential calls
+		 * @param[in]	cache			Cached data from previous requests that can be used for speeding up sequential calls
 		 *								to this method. Caller should ensure to maintain a persistent instance of this data
 		 *								for every animation using this curve in order to ensure cache is maintained.
 		 * @param[in]	loop			If true the curve will loop when it goes past the end or beggining. Otherwise the

+ 4 - 4
Source/BansheeCore/Include/BsMesh.h

@@ -216,7 +216,7 @@ namespace BansheeEngine
 		 */
 
 		/**
-		 * @copydoc	create(UINT32, UINT32, const SPtr<VertexDataDesc>&, int, DrawOperationType, IndexType)
+		 * @copydoc	create(UINT32, UINT32, const SPtr<VertexDataDesc>&, int, DrawOperationType, IndexType, const SPtr<Skeleton>&)
 		 *
 		 * @note	Internal method. Use create() for normal use.
 		 */
@@ -225,7 +225,7 @@ namespace BansheeEngine
 			const SPtr<Skeleton>& skeleton = nullptr);
 
 		/**
-		 * @copydoc	create(UINT32, UINT32, const SPtr<VertexDataDesc>&, const Vector<SubMesh>&, int, IndexType)
+		 * @copydoc	create(UINT32, UINT32, const SPtr<VertexDataDesc>&, const Vector<SubMesh>&, int, IndexType, const SPtr<Skeleton>&)
 		 *
 		 * @note	Internal method. Use create() for normal use.
 		 */
@@ -234,7 +234,7 @@ namespace BansheeEngine
 			const SPtr<Skeleton>& skeleton = nullptr);
 
 		/**
-		 * @copydoc	create(const SPtr<MeshData>&, int, DrawOperationType)
+		 * @copydoc	create(const SPtr<MeshData>&, int, DrawOperationType, const SPtr<Skeleton>&)
 		 *
 		 * @note	Internal method. Use create() for normal use.
 		 */
@@ -242,7 +242,7 @@ namespace BansheeEngine
 			DrawOperationType drawOp = DOT_TRIANGLE_LIST, const SPtr<Skeleton>& skeleton = nullptr);
 
 		/**
-		 * @copydoc	create(const SPtr<MeshData>&, const Vector<SubMesh>&, int)
+		 * @copydoc	create(const SPtr<MeshData>&, const Vector<SubMesh>&, int, const SPtr<Skeleton>&)
 		 *
 		 * @note	Internal method. Use create() for normal use.
 		 */

+ 4 - 4
Source/BansheeCore/Include/BsMeshManager.h

@@ -19,19 +19,19 @@ namespace BansheeEngine
 		MeshManager();
 		~MeshManager();
 
-		/** @copydoc Mesh::create(UINT32, UINT32, const SPtr<VertexDataDesc>&, int, DrawOperationType, IndexType) */
+		/** @copydoc Mesh::create(UINT32, UINT32, const SPtr<VertexDataDesc>&, int, DrawOperationType, IndexType, const SPtr<Skeleton>&) */
 		SPtr<Mesh> create(UINT32 numVertices, UINT32 numIndices, const SPtr<VertexDataDesc>& vertexDesc, int usage = MU_STATIC, 
 			DrawOperationType drawOp = DOT_TRIANGLE_LIST, IndexType indexType = IT_32BIT, const SPtr<Skeleton>& skeleton = nullptr);
 
-		/** @copydoc Mesh::create(UINT32, UINT32, const SPtr<VertexDataDesc>&, const Vector<SubMesh>&, int, IndexType) */
+		/** @copydoc Mesh::create(UINT32, UINT32, const SPtr<VertexDataDesc>&, const Vector<SubMesh>&, int, IndexType, const SPtr<Skeleton>&) */
 		SPtr<Mesh> create(UINT32 numVertices, UINT32 numIndices, const SPtr<VertexDataDesc>& vertexDesc, const Vector<SubMesh>& subMeshes, 
 			int usage = MU_STATIC, IndexType indexType = IT_32BIT, const SPtr<Skeleton>& skeleton = nullptr);
 
-		/** @copydoc Mesh::create(const SPtr<MeshData>&, int, DrawOperationType) */
+		/** @copydoc Mesh::create(const SPtr<MeshData>&, int, DrawOperationType, const SPtr<Skeleton>&) */
 		SPtr<Mesh> create(const SPtr<MeshData>& initialData, int usage = MU_STATIC, DrawOperationType drawOp = DOT_TRIANGLE_LIST, 
 			const SPtr<Skeleton>& skeleton = nullptr);
 
-		/** @copydoc Mesh::create(const SPtr<MeshData>&, const Vector<SubMesh>&, int) */
+		/** @copydoc Mesh::create(const SPtr<MeshData>&, const Vector<SubMesh>&, int, const SPtr<Skeleton>&) */
 		SPtr<Mesh> create(const SPtr<MeshData>& initialData, const Vector<SubMesh>& subMeshes, int usage = MU_STATIC, 
 			const SPtr<Skeleton>& skeleton = nullptr);
 

+ 5 - 5
Source/BansheeCore/Include/BsRenderAPI.h

@@ -47,7 +47,7 @@ namespace BansheeEngine
 		 * @param[in]	accessor	Accessor on which will this command be queued for execution.
 		 */
 		static void setLoadStoreTexture(CoreAccessor& accessor, GpuProgramType gptype, UINT16 texUnit, bool enabled, 
-			const SPtr<Texture>& texPtr, const TextureSurface& surface);
+			const SPtr<Texture>& texture, const TextureSurface& surface);
 
 		/**  
 		 * @copydoc RenderAPICore::setBuffer()
@@ -370,9 +370,9 @@ namespace BansheeEngine
 		 *
 		 * @param[in]	gptype			Determines to which GPU program slot to bind the texture.
 		 * @param[in]	texUnit			Texture unit index to bind the texture to.
-		 * @param[in]	texPtr			Texture to bind.
+		 * @param[in]	texture			Texture to bind.
 		 */
-		virtual void setTexture(GpuProgramType gptype, UINT16 texUnit, const SPtr<TextureCore>& texPtr) = 0;
+		virtual void setTexture(GpuProgramType gptype, UINT16 texUnit, const SPtr<TextureCore>& texture) = 0;
 
 		/**	
 		 * Binds a texture that can be used for random load/store operations from a GPU program. 
@@ -380,11 +380,11 @@ namespace BansheeEngine
 		 * @param[in]	gptype			Determines to which GPU program slot to bind the texture.
 		 * @param[in]	texUnit			Texture unit index to bind the texture to.
 		 * @param[in]	enabled			True to bind the texture at the specified unit, false to unbind.
-		 * @param[in]	texPtr			Texture to bind.
+		 * @param[in]	texture			Texture to bind.
 		 * @param[in]	surface			Determines which surface of the texture to bind.
 		 */
 		virtual void setLoadStoreTexture(GpuProgramType gptype, UINT16 texUnit, bool enabled,
-			const SPtr<TextureCore>& texPtr, const TextureSurface& surface) = 0;
+			const SPtr<TextureCore>& texture, const TextureSurface& surface) = 0;
 
 		/**
 		 * Binds a buffer that can be used for read or write operations on the GPU.

+ 2 - 2
Source/BansheeD3D11RenderAPI/Include/BsD3D11RenderAPI.h

@@ -37,10 +37,10 @@ namespace BansheeEngine
 		void setSamplerState(GpuProgramType gptype, UINT16 texUnit, const SPtr<SamplerStateCore>& samplerState) override;
 
 		/** @copydoc RenderAPICore::setTexture */
-		void setTexture(GpuProgramType gptype, UINT16 texUnit, const SPtr<TextureCore>& texPtr) override;
+		void setTexture(GpuProgramType gptype, UINT16 texUnit, const SPtr<TextureCore>& texture) override;
 
 		/** @copydoc RenderAPICore::setLoadStoreTexture */
-		void setLoadStoreTexture(GpuProgramType gptype, UINT16 texUnit, bool enabled, const SPtr<TextureCore>& texPtr,
+		void setLoadStoreTexture(GpuProgramType gptype, UINT16 texUnit, bool enabled, const SPtr<TextureCore>& texture,
 			const TextureSurface& surface) override;
 
 		/** @copydoc RenderAPICore::setBuffer */

+ 2 - 2
Source/BansheeD3D9RenderAPI/Include/BsD3D9RenderAPI.h

@@ -53,13 +53,13 @@ namespace BansheeEngine
 		void setDrawOperation(DrawOperationType op) override;
 
 		/** @copydoc RenderAPICore::setTexture() */
-		void setTexture(GpuProgramType gptype, UINT16 texUnit, const SPtr<TextureCore>& texPtr) override;
+		void setTexture(GpuProgramType gptype, UINT16 texUnit, const SPtr<TextureCore>& texture) override;
 
 		/** @copydoc RenderAPICore::setBuffer */
 		void setBuffer(GpuProgramType gptype, UINT16 unit, const SPtr<GpuBufferCore>& buffer, bool loadStore = false) override;
 
 		/** @copydoc RenderAPICore::setLoadStoreTexture() */
-		void setLoadStoreTexture(GpuProgramType gptype, UINT16 texUnit, bool enabled, const SPtr<TextureCore>& texPtr,
+		void setLoadStoreTexture(GpuProgramType gptype, UINT16 texUnit, bool enabled, const SPtr<TextureCore>& texture,
 			const TextureSurface& surface) override;
 
 		/** @copydoc RenderAPICore::setSamplerState() */

+ 1 - 1
Source/BansheeEditor/Include/BsGUIColor.h

@@ -64,7 +64,7 @@ namespace BansheeEngine
 		/** @copydoc GUIElement::_getMaterial() */
 		const SpriteMaterialInfo& _getMaterial(UINT32 renderElementIdx, SpriteMaterial** material) const override;
 
-		/** @copydoc GUIElement::_getMeshSize() */
+		/** @copydoc GUIElement::_getMeshInfo() */
 		void _getMeshInfo(UINT32 renderElementIdx, UINT32& numVertices, UINT32& numIndices, GUIMeshType& type) const override;
 
 		/** @copydoc GUIElement::_fillBuffer() */

+ 1 - 1
Source/BansheeEngine/Include/BsGUIButtonBase.h

@@ -71,7 +71,7 @@ namespace BansheeEngine
 		/** @copydoc GUIElement::_getMaterial */
 		const SpriteMaterialInfo& _getMaterial(UINT32 renderElementIdx, SpriteMaterial** material) const override;
 
-		/** @copydoc GUIElement::_getMeshSize() */
+		/** @copydoc GUIElement::_getMeshInfo() */
 		void _getMeshInfo(UINT32 renderElementIdx, UINT32& numVertices, UINT32& numIndices, GUIMeshType& type) const override;
 
 		/** @copydoc GUIElement::_fillBuffer */

+ 1 - 1
Source/BansheeEngine/Include/BsGUICanvas.h

@@ -191,7 +191,7 @@ namespace BansheeEngine
 		/** @copydoc GUIElement::_getMaterial */
 		const SpriteMaterialInfo& _getMaterial(UINT32 renderElementIdx, SpriteMaterial** material) const override;
 
-		/** @copydoc GUIElement::_getMeshSize() */
+		/** @copydoc GUIElement::_getMeshInfo() */
 		void _getMeshInfo(UINT32 renderElementIdx, UINT32& numVertices, UINT32& numIndices, GUIMeshType& type) const override;
 
 		/** @copydoc GUIElement::_fillBuffer */

+ 1 - 1
Source/BansheeEngine/Include/BsGUIElement.h

@@ -131,7 +131,7 @@ namespace BansheeEngine
 		 * @param[in]	renderElementIdx	Zero-based index of the render element.
 		 *
 		 * @see		_getNumRenderElements()
-		 * @see		_getMeshSize()
+		 * @see		_getMeshInfo()
 		 */
 		virtual void _fillBuffer(UINT8* vertices, UINT32* indices, UINT32 vertexOffset, UINT32 indexOffset,
 			UINT32 maxNumVerts, UINT32 maxNumIndices, UINT32 renderElementIdx) const = 0;

+ 1 - 1
Source/BansheeEngine/Include/BsGUIElementContainer.h

@@ -24,7 +24,7 @@ namespace BansheeEngine
 		/** @copydoc GUIElement::_getMaterial */
 		const SpriteMaterialInfo& _getMaterial(UINT32 renderElementIdx, SpriteMaterial** material) const override;
 
-		/** @copydoc GUIElement::_getMeshSize() */
+		/** @copydoc GUIElement::_getMeshInfo() */
 		void _getMeshInfo(UINT32 renderElementIdx, UINT32& numVertices, UINT32& numIndices, GUIMeshType& type) const override;
 
 		/** @copydoc GUIElement::_fillBuffer */

+ 1 - 1
Source/BansheeEngine/Include/BsGUIInputBox.h

@@ -106,7 +106,7 @@ namespace BansheeEngine
 		/** @copydoc GUIElement::_getMaterial() */
 		const SpriteMaterialInfo& _getMaterial(UINT32 renderElementIdx, SpriteMaterial** material) const override;
 
-		/** @copydoc GUIElement::_getMeshSize() */
+		/** @copydoc GUIElement::_getMeshInfo() */
 		void _getMeshInfo(UINT32 renderElementIdx, UINT32& numVertices, UINT32& numIndices, GUIMeshType& type) const override;
 
 		/** @copydoc GUIElement::_fillBuffer() */

+ 1 - 1
Source/BansheeEngine/Include/BsGUILabel.h

@@ -84,7 +84,7 @@ namespace BansheeEngine
 		/** @copydoc GUIElement::_getMaterial */
 		const SpriteMaterialInfo& _getMaterial(UINT32 renderElementIdx, SpriteMaterial** material) const override;
 
-		/** @copydoc GUIElement::_getMeshSize() */
+		/** @copydoc GUIElement::_getMeshInfo() */
 		void _getMeshInfo(UINT32 renderElementIdx, UINT32& numVertices, UINT32& numIndices, GUIMeshType& type) const override;
 
 		/** @copydoc GUIElement::_fillBuffer */

+ 1 - 1
Source/BansheeEngine/Include/BsGUIScrollBar.h

@@ -82,7 +82,7 @@ namespace BansheeEngine
 		/** @copydoc GUIElement::_getMaterial */
 		const SpriteMaterialInfo& _getMaterial(UINT32 renderElementIdx, SpriteMaterial** material) const override;
 
-		/** @copydoc GUIElement::_getMeshSize() */
+		/** @copydoc GUIElement::_getMeshInfo() */
 		void _getMeshInfo(UINT32 renderElementIdx, UINT32& numVertices, UINT32& numIndices, GUIMeshType& type) const override;
 
 		/** @copydoc GUIElement::_fillBuffer */

+ 1 - 1
Source/BansheeEngine/Include/BsGUISliderHandle.h

@@ -108,7 +108,7 @@ namespace BansheeEngine
 		/** @copydoc GUIElement::_getMaterial() */
 		const SpriteMaterialInfo& _getMaterial(UINT32 renderElementIdx, SpriteMaterial** material) const override;
 
-		/** @copydoc GUIElement::_getMeshSize() */
+		/** @copydoc GUIElement::_getMeshInfo() */
 		void _getMeshInfo(UINT32 renderElementIdx, UINT32& numVertices, UINT32& numIndices, GUIMeshType& type) const override;
 
 		/** @copydoc GUIElement::_fillBuffer() */

+ 1 - 1
Source/BansheeEngine/Include/BsGUITexture.h

@@ -165,7 +165,7 @@ namespace BansheeEngine
 		/** @copydoc GUIElement::_getMaterial */
 		const SpriteMaterialInfo& _getMaterial(UINT32 renderElementIdx, SpriteMaterial** material) const override;
 
-		/** @copydoc GUIElement::_getMeshSize() */
+		/** @copydoc GUIElement::_getMeshInfo() */
 		void _getMeshInfo(UINT32 renderElementIdx, UINT32& numVertices, UINT32& numIndices, GUIMeshType& type) const override;
 
 		/** @copydoc GUIElement::_fillBuffer */

+ 1 - 1
Source/BansheeEngine/Include/BsGUIViewport.h

@@ -69,7 +69,7 @@ namespace BansheeEngine
 		/** @copydoc GUIElement::_getMaterial */
 		const SpriteMaterialInfo& _getMaterial(UINT32 renderElementIdx, SpriteMaterial** material) const override;
 
-		/** @copydoc GUIElement::_getMeshSize() */
+		/** @copydoc GUIElement::_getMeshInfo() */
 		void _getMeshInfo(UINT32 renderElementIdx, UINT32& numVertices, UINT32& numIndices, GUIMeshType& type) const override;
 
 		/** @copydoc GUIElement::_fillBuffer */

+ 1 - 1
Source/BansheeFMOD/Include/BsFMODAudio.h

@@ -31,7 +31,7 @@ namespace BansheeEngine
 		/** @copydoc Audio::isPaused */
 		bool isPaused() const override { return mIsPaused; }
 
-		/** @copydoc Audio::update */
+		/** @copydoc Audio::_update */
 		void _update() override;
 
 		/** @copydoc Audio::setActiveDevice */

+ 1 - 1
Source/BansheeFMOD/Include/BsFMODAudioClip.h

@@ -50,7 +50,7 @@ namespace BansheeEngine
 		/** @copydoc Resource::initialize */
 		void initialize() override;
 
-		/** @copydoc AudioClip::getSourceFormatData */
+		/** @copydoc AudioClip::getSourceStream */
 		SPtr<DataStream> getSourceStream(UINT32& size) override;
 
 		FMOD::Sound* mSound;

+ 1 - 1
Source/BansheeFMOD/Include/BsFMODAudioSource.h

@@ -41,7 +41,7 @@ namespace BansheeEngine
 		void setPriority(INT32 priority) override;
 
 		/** @copydoc AudioSource::setTime */
-		void setTime(float setTime) override;
+		void setTime(float time) override;
 
 		/** @copydoc AudioSource::getTime */
 		float getTime() const override;

+ 2 - 2
Source/BansheeGLRenderAPI/Include/BsGLRenderAPI.h

@@ -46,10 +46,10 @@ namespace BansheeEngine
 		void setScissorRect(UINT32 left, UINT32 top, UINT32 right, UINT32 bottom) override;
 
 		/** @copydoc RenderAPICore::setTexture() */
-		void setTexture(GpuProgramType gptype, UINT16 texUnit, const SPtr<TextureCore>& texPtr) override;
+		void setTexture(GpuProgramType gptype, UINT16 texUnit, const SPtr<TextureCore>& texture) override;
 
 		/** @copydoc RenderAPICore::setLoadStoreTexture */
-		void setLoadStoreTexture(GpuProgramType gptype, UINT16 texUnit, bool enabled, const SPtr<TextureCore>& texPtr,
+		void setLoadStoreTexture(GpuProgramType gptype, UINT16 texUnit, bool enabled, const SPtr<TextureCore>& texture,
 			const TextureSurface& surface) override;
         
 		/** @copydoc RenderAPICore::setBuffer */

+ 4 - 4
Source/BansheeOpenAudio/Include/BsFLACDecoder.h

@@ -31,16 +31,16 @@ namespace BansheeEngine
 		FLACDecoder();
 		~FLACDecoder();
 
-		/** @copydoc OAFileReader::open */
+		/** @copydoc AudioDecoder::open */
 		bool open(const SPtr<DataStream>& stream, AudioDataInfo& info, UINT32 offset = 0) override;
 
-		/** @copydoc OAFileReader::seek */
+		/** @copydoc AudioDecoder::seek */
 		void seek(UINT32 offset) override;
 
-		/** @copydoc OAFileReader::read */
+		/** @copydoc AudioDecoder::read */
 		UINT32 read(UINT8* samples, UINT32 numSamples) override;
 
-		/** @copydoc OAFileReader::isValid */
+		/** @copydoc AudioDecoder::isValid */
 		bool isValid(const SPtr<DataStream>& stream, UINT32 offset = 0) override;
 	private:
 		/** Cleans up the FLAC decoder. */

+ 1 - 1
Source/BansheeOpenAudio/Include/BsOAAudio.h

@@ -31,7 +31,7 @@ namespace BansheeEngine
 		/** @copydoc Audio::isPaused */
 		bool isPaused() const override { return mIsPaused; }
 
-		/** @copydoc Audio::update */
+		/** @copydoc Audio::_update */
 		void _update() override;
 
 		/** @copydoc Audio::setActiveDevice */

+ 1 - 1
Source/BansheeOpenAudio/Include/BsOAAudioClip.h

@@ -45,7 +45,7 @@ namespace BansheeEngine
 		/** @copydoc Resource::initialize */
 		void initialize() override;
 
-		/** @copydoc AudioClip::getSourceFormatData */
+		/** @copydoc AudioClip::getSourceStream */
 		SPtr<DataStream> getSourceStream(UINT32& size) override;
 	private:
 		mutable Mutex mMutex;

+ 1 - 1
Source/BansheeOpenAudio/Include/BsOAAudioSource.h

@@ -46,7 +46,7 @@ namespace BansheeEngine
 		void setAttenuation(float attenuation) override;
 
 		/** @copydoc AudioSource::setTime */
-		void setTime(float setTime) override;
+		void setTime(float time) override;
 
 		/** @copydoc AudioSource::getTime */
 		float getTime() const override;

+ 4 - 4
Source/BansheeOpenAudio/Include/BsOggVorbisDecoder.h

@@ -30,16 +30,16 @@ namespace BansheeEngine
 		OggVorbisDecoder();
 		~OggVorbisDecoder();
 
-		/** @copydoc OAFileReader::open */
+		/** @copydoc AudioDecoder::open */
 		bool open(const SPtr<DataStream>& stream, AudioDataInfo& info, UINT32 offset = 0) override;
 
-		/** @copydoc OAFileReader::read */
+		/** @copydoc AudioDecoder::read */
 		UINT32 read(UINT8* samples, UINT32 numSamples) override;
 
-		/** @copydoc OAFileReader::seek */
+		/** @copydoc AudioDecoder::seek */
 		void seek(UINT32 offset) override;
 
-		/** @copydoc OAFileReader::isValid */
+		/** @copydoc AudioDecoder::isValid */
 		bool isValid(const SPtr<DataStream>& stream, UINT32 offset = 0) override;
 	private:
 		OggDecoderData mDecoderData;

+ 4 - 4
Source/BansheeOpenAudio/Include/BsWaveDecoder.h

@@ -17,16 +17,16 @@ namespace BansheeEngine
 	public:
 		WaveDecoder();
 
-		/** @copydoc OAFileReader::open */
+		/** @copydoc AudioDecoder::open */
 		bool open(const SPtr<DataStream>& stream, AudioDataInfo& info, UINT32 offset = 0) override;
 
-		/** @copydoc OAFileReader::read */
+		/** @copydoc AudioDecoder::read */
 		UINT32 read(UINT8* samples, UINT32 numSamples) override;
 
-		/** @copydoc OAFileReader::seek */
+		/** @copydoc AudioDecoder::seek */
 		void seek(UINT32 offset) override;
 
-		/** @copydoc OAFileReader::isValid */
+		/** @copydoc AudioDecoder::isValid */
 		bool isValid(const SPtr<DataStream>& stream, UINT32 offset = 0) override;
 	private:
 		/** Parses the WAVE header and output audio file meta-data. Returns false if the header is not valid. */