More work on improving documentation for Doxygen generation

Doxyfile

@@ -777,7 +777,21 @@ WARN_LOGFILE           =
 
 INPUT                  = Source/BansheeUtility/Include \
                          Source/BansheeCore/Include \
-                         Source/BansheeEngine/Include
+                         Source/BansheeEngine/Include \
+                         Source/BansheeEditor/Include \
+                         Source/BansheeD3D9RenderAPI/Include \
+                         Source/BansheeD3D11RenderAPI/Include \
+                         Source/BansheeFBXImporter/Include \
+                         Source/BansheeFontImporter/Include \
+                         Source/BansheeFreeImgImporter/Include \
+                         Source/BansheeGLRenderAPI/Include \
+                         Source/BansheeMono/Include \
+                         Source/BansheeOISInput/Include \
+                         Source/BansheePhysX/Include \
+                         Source/BansheeSL/Include \
+                         Source/RenderBeast/Include \
+                         Source/SBansheeEngine/Include \
+                         Source/SBansheeEditor/Include
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses

Source/BansheeCore/Include/BsCorePrerequisites.h

@@ -8,7 +8,7 @@
  *  @{
  */
 
-/** @defgroup Core Core
+/** @defgroup Core 2. Core
  *	Second lowest layer that provides core engine functionality and abstract interfaces for various systems.
  *  @{
  */
@@ -22,7 +22,7 @@
  */
 
 /** @defgroup Input Input
- *	Input (mouse, keyboard, gamepad, etc.).
+ *	%Input (mouse, keyboard, gamepad, etc.).
  */
 
 /** @defgroup Localization Localization
@@ -80,7 +80,7 @@
   */
 
 /** @defgroup Physics Physics
- *	Physics system: colliders, triggers, rigidbodies, joints, scene queries, etc.
+ *	%Physics system: colliders, triggers, rigidbodies, joints, scene queries, etc.
  */
 
 /** @defgroup Internal-Core [INTERNAL]

Source/BansheeD3D11RenderAPI/Include/BsD3D11GpuBuffer.h

@@ -40,7 +40,6 @@ namespace BansheeEngine
 	protected:
 		friend class D3D11HardwareBufferCoreManager;
 
-		/** @copydoc GpuBufferCore::GpuBufferCore */
 		D3D11GpuBufferCore(UINT32 elementCount, UINT32 elementSize, GpuBufferType type, GpuBufferUsage usage,
 			bool randomGpuWrite = false, bool useCounter = false);
 

Source/BansheeD3D11RenderAPI/Include/BsD3D11GpuParamBlockBuffer.h

@@ -18,10 +18,10 @@ namespace BansheeEngine
 		D3D11GpuParamBlockBufferCore(UINT32 size, GpuParamBlockUsage usage);
 		~D3D11GpuParamBlockBufferCore();
 
-		/** @copydoc GpuParamBlockBufferCore::writeData */
+		/** @copydoc GpuParamBlockBufferCore::writeToGPU */
 		void writeToGPU(const UINT8* data) override;
 
-		/** @copydoc GpuParamBlockBufferCore::readData */
+		/** @copydoc GpuParamBlockBufferCore::readFromGPU */
 		void readFromGPU(UINT8* data) const override;
 
 		/**	Returns internal DX11 buffer object. */

Source/BansheeD3D11RenderAPI/Include/BsD3D11GpuProgram.h

@@ -24,7 +24,6 @@ namespace BansheeEngine
 		UINT32 getProgramId() const { return mProgramId; }
 
 	protected:
-		/** @copydoc GpuProgramCore::GpuProgramCore */
 		D3D11GpuProgramCore(const String& source, const String& entryPoint, GpuProgramType gptype,
 			GpuProgramProfile profile, bool isAdjacencyInfoRequired);
 
@@ -63,7 +62,6 @@ namespace BansheeEngine
 	protected:
 		friend class D3D11HLSLProgramFactory;
 
-		/** @copydoc GpuProgramCore::GpuProgramCore */
 		D3D11GpuVertexProgramCore(const String& source, const String& entryPoint,
 			GpuProgramProfile profile);
 
@@ -86,7 +84,6 @@ namespace BansheeEngine
 	protected:
 		friend class D3D11HLSLProgramFactory;
 
-		/** @copydoc GpuProgramCore::GpuProgramCore */
 		D3D11GpuFragmentProgramCore(const String& source, const String& entryPoint,
 			GpuProgramProfile profile);
 
@@ -109,7 +106,6 @@ namespace BansheeEngine
 	protected:
 		friend class D3D11HLSLProgramFactory;
 
-		/** @copydoc GpuProgramCore::GpuProgramCore */
 		D3D11GpuDomainProgramCore(const String& source, const String& entryPoint,
 			GpuProgramProfile profile);
 
@@ -132,7 +128,6 @@ namespace BansheeEngine
 	protected:
 		friend class D3D11HLSLProgramFactory;
 
-		/** @copydoc GpuProgramCore::GpuProgramCore */
 		D3D11GpuHullProgramCore(const String& source, const String& entryPoint,
 			GpuProgramProfile profile);
 
@@ -155,7 +150,6 @@ namespace BansheeEngine
 	protected:
 		friend class D3D11HLSLProgramFactory;
 
-		/** @copydoc GpuProgramCore::GpuProgramCore */
 		D3D11GpuGeometryProgramCore(const String& source, const String& entryPoint,
 			GpuProgramProfile profile, bool isAdjacencyInfoRequired);
 
@@ -178,7 +172,6 @@ namespace BansheeEngine
 	protected:
 		friend class D3D11HLSLProgramFactory;
 
-		/** @copydoc GpuProgramCore::GpuProgramCore */
 		D3D11GpuComputeProgramCore(const String& source, const String& entryPoint,
 			GpuProgramProfile profile);
 

Source/BansheeD3D11RenderAPI/Include/BsD3D11HLSLProgramFactory.h

@@ -23,7 +23,7 @@ namespace BansheeEngine
 
 		/** @copydoc GpuProgramFactory::create(const String&, const String&, GpuProgramType, GpuProgramProfile, bool) */
 		SPtr<GpuProgramCore> create(const String& source, const String& entryPoint, GpuProgramType gptype, 
-			GpuProgramProfile profile, bool requireAdjacencyInfo) override;
+			GpuProgramProfile profile, bool requiresAdjacency) override;
 
 		/** @copydoc GpuProgramFactory::create(GpuProgramType) */
 		SPtr<GpuProgramCore> create(GpuProgramType type) override;

Source/BansheeD3D11RenderAPI/Include/BsD3D11HardwareBuffer.h

@@ -36,17 +36,16 @@ namespace BansheeEngine
 			BT_APPENDCONSUME = BT_GROUP_GENERIC | 0x80 
 		};
 
-		/** @copydoc HardwareBuffer::HardwareBuffer */
 		D3D11HardwareBuffer(BufferType btype, GpuBufferUsage usage, UINT32 elementCount, UINT32 elementSize, 
-			D3D11Device& device, bool useSystemMem = false, bool streamOut = false, bool randomGpuWrite = false, 
+			D3D11Device& device, bool systemMemory = false, bool streamOut = false, bool randomGpuWrite = false, 
 			bool useCounter = false);
 		~D3D11HardwareBuffer();
 
 		/** @copydoc HardwareBuffer::readData */
-		void readData(UINT32 offset, UINT32 length, void* pDest) override;
+		void readData(UINT32 offset, UINT32 length, void* dest) override;
 
 		/** @copydoc HardwareBuffer::writeData */
-		void writeData(UINT32 offset, UINT32 length, const void* pSource, 
+		void writeData(UINT32 offset, UINT32 length, const void* source, 
 			BufferWriteType writeFlags = BufferWriteType::Normal) override;
 
 		/** @copydoc HardwareBuffer::copyData */

Source/BansheeD3D11RenderAPI/Include/BsD3D11HardwareBufferManager.h

@@ -18,11 +18,11 @@ namespace BansheeEngine
 		D3D11HardwareBufferCoreManager(D3D11Device& device);
 
 	protected:     
-		/** @copydoc HardwareBufferCoreManager::createVertexBufferImpl */
+		/** @copydoc HardwareBufferCoreManager::createVertexBufferInternal */
 		SPtr<VertexBufferCore> createVertexBufferInternal(UINT32 vertexSize, UINT32 numVerts, 
 			GpuBufferUsage usage, bool streamOut = false) override;
 
-		/** @copydoc HardwareBufferCoreManager::createIndexBufferImpl */
+		/** @copydoc HardwareBufferCoreManager::createIndexBufferInternal */
 		SPtr<IndexBufferCore> createIndexBufferInternal(IndexType itype, UINT32 numIndexes, 
 			GpuBufferUsage usage) override;
 

Source/BansheeD3D11RenderAPI/Include/BsD3D11IndexBuffer.h

@@ -21,10 +21,10 @@ namespace BansheeEngine
 		~D3D11IndexBufferCore();
 
 		/** @copydoc IndexBufferCore::readData */
-		void readData(UINT32 offset, UINT32 length, void* pDest) override;
+		void readData(UINT32 offset, UINT32 length, void* dest) override;
 
 		/** @copydoc IndexBufferCore::writeData */
-		void writeData(UINT32 offset, UINT32 length, const void* pSource, 
+		void writeData(UINT32 offset, UINT32 length, const void* source, 
 			BufferWriteType writeFlags = BufferWriteType::Normal) override;
 
 		/** @copydoc IndexBufferCore::copyData */

Source/BansheeD3D11RenderAPI/Include/BsD3D11OcclusionQuery.h

@@ -27,7 +27,7 @@ namespace BansheeEngine
 		/** @copydoc OcclusionQuery::isReady */
 		bool isReady() const override;
 
-		/** @copydoc OcclusionQuery::getNumFragments */
+		/** @copydoc OcclusionQuery::getNumSamples */
 		UINT32 getNumSamples() override;
 
 	private:

Source/BansheeD3D11RenderAPI/Include/BsD3D11Prerequisites.h

@@ -20,6 +20,8 @@
 #include <D3Dcompiler.h>
 
 /** @addtogroup Plugins
+ *  @{
+ */
 
 /** @defgroup D3D11 BansheeD3D11RenderAPI
  *	Wrapper around the DirectX 11 render API.

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 unit, bool enabled, const SPtr<TextureCore>& texPtr) override;
+		void setTexture(GpuProgramType gptype, UINT16 texUnit, bool enabled, const SPtr<TextureCore>& texPtr) override;
 
 		/** @copydoc RenderAPICore::setLoadStoreTexture */
-		void setLoadStoreTexture(GpuProgramType gptype, UINT16 unit, bool enabled, const SPtr<TextureCore>& texPtr,
+		void setLoadStoreTexture(GpuProgramType gptype, UINT16 texUnit, bool enabled, const SPtr<TextureCore>& texPtr,
 			const TextureSurface& surface) override;
 
 		/** @copydoc RenderAPICore::disableTextureUnit */
@@ -64,7 +64,7 @@ namespace BansheeEngine
 		void setRenderTarget(const SPtr<RenderTargetCore>& target, bool readOnlyDepthStencil = false) override;
 
 		/** @copydoc RenderAPICore::setViewport */
-		void setViewport(const Rect2& vp) override;
+		void setViewport(const Rect2& area) override;
 
 		/** @copydoc RenderAPICore::setScissorRect */
 		void setScissorRect(UINT32 left, UINT32 top, UINT32 right, UINT32 bottom) override;
@@ -142,7 +142,7 @@ namespace BansheeEngine
 		/** @copydoc RenderAPICore::initializeFinalize */
 		void initializeFinalize(const SPtr<RenderWindowCore>& primaryWindow) override;
 
-		/** @copydoc RenderAPICore::destroy_internal */
+		/** @copydoc RenderAPICore::destroyCore */
 		void destroyCore() override;
 
 		/**

Source/BansheeD3D11RenderAPI/Include/BsD3D11RenderAPIFactory.h

@@ -19,10 +19,10 @@ namespace BansheeEngine
 	class D3D11RenderAPIFactory : public RenderAPIFactory
 	{
 	public:
-		/** @copydoc RenderSystemFactory::create */
+		/** @copydoc RenderAPIFactory::create */
 		void create() override;
 
-		/** @copydoc RenderSystemFactory::name */
+		/** @copydoc RenderAPIFactory::name */
 		const String& name() const override { return SystemName; }
 
 	private:

Source/BansheeD3D11RenderAPI/Include/BsD3D11RenderUtility.h

@@ -23,7 +23,7 @@ namespace BansheeEngine
 		 * APIs like DX9 and OpenGL where you can clear only a part of the render target. (DX11 API only provides a way to
 		 * clear the entire render target).
 		 *
-		 * @param[in]	buffers			Combination of one or more elements of FrameBufferType denoting which buffers are
+		 * @param[in]	clearBuffers	Combination of one or more elements of FrameBufferType denoting which buffers are
 		 *								to be cleared.
 		 * @param[in]	color			(optional) The color to clear the color buffer with, if enabled.
 		 * @param[in]	depth			(optional) The value to initialize the depth buffer with, if enabled.

Source/BansheeD3D11RenderAPI/Include/BsD3D11RenderWindow.h

@@ -33,7 +33,6 @@ namespace BansheeEngine
 	class BS_D3D11_EXPORT D3D11RenderWindowCore : public RenderWindowCore
 	{
 	public:
-		/** @copydoc RenderWindowCore::RenderWindowCore */
 		D3D11RenderWindowCore(const RENDER_WINDOW_DESC& desc, UINT32 windowId,
 			D3D11Device& device, IDXGIFactory* DXGIFactory);
 
@@ -64,12 +63,17 @@ namespace BansheeEngine
 		void setFullscreen(UINT32 width, UINT32 height, float refreshRate = 60.0f, UINT32 monitorIdx = 0) override;
 
 		/** @copydoc RenderWindowCore::setFullscreen(const VideoMode&) */
-		void setFullscreen(const VideoMode& mode) override;
+		void setFullscreen(const VideoMode& videoMode) override;
 
 		/** @copydoc RenderWindowCore::setWindowed */
 		void setWindowed(UINT32 width, UINT32 height) override;
 
-		/** @copydoc RenderWindowCore::copyContentsToMemory */
+		/** 
+		 * Copies the contents of a frame buffer into the pre-allocated buffer. 
+		 *
+		 * @param[out]	dst		Previously allocated buffer to read the contents into. Must be of valid size.
+		 * @param[in]	buffer	Frame buffer to read the contents from.
+		 */
 		void copyToMemory(PixelData &dst, FrameBuffer buffer);
 
 		/** @copydoc RenderWindowCore::swapBuffers */

Source/BansheeD3D11RenderAPI/Include/BsD3D11Texture.h

@@ -111,14 +111,11 @@ namespace BansheeEngine
 		 * Maps a static buffer, for writing only. Returned pointer points to temporary CPU memory that will be copied to
 		 * the mapped resource on "unmap" call.
 		 *
-		 * @param[in]	flags		Mapping flags that let the API know what are we planning to do with mapped memory.
+		 * @param[in]	lock		Area of the texture to lock.
 		 * @param[in]	mipLevel	Mip level to map (0 being the base level).
 		 * @param[in]	face		Texture face to map, in case texture has more than one.
-		 * @param[out]	rowPitch	Output size of a single row in bytes.
-		 * @param[out]	slicePitch	Output size of a single slice in bytes (relevant only for 3D textures).
-		 * @return					Pointer to the mapped area of memory.
 		 */
-		void* mapstaticbuffer(PixelData lock, UINT32 mipLevel, UINT32 slice);
+		void* mapstaticbuffer(PixelData lock, UINT32 mipLevel, UINT32 face);
 
 		/**	Unmaps a previously mapped static buffer and flushes its data to the actual GPU buffer. */
 		void unmapstaticbuffer();

Source/BansheeD3D11RenderAPI/Include/BsD3D11VertexBuffer.h

@@ -22,10 +22,10 @@ namespace BansheeEngine
 		~D3D11VertexBufferCore();
 
 		/** @copydoc VertexBufferCore::readData */
-		void readData(UINT32 offset, UINT32 length, void* pDest) override;
+		void readData(UINT32 offset, UINT32 length, void* dest) override;
 
 		/** @copydoc VertexBufferCore::writeData */
-		void writeData(UINT32 offset, UINT32 length, const void* pSource, BufferWriteType writeFlags = BufferWriteType::Normal) override;
+		void writeData(UINT32 offset, UINT32 length, const void* source, BufferWriteType writeFlags = BufferWriteType::Normal) override;
 
 		/** @copydoc VertexBufferCore::copyData */
 		void copyData(HardwareBuffer& srcBuffer, UINT32 srcOffset, UINT32 dstOffset, UINT32 length, bool discardWholeBuffer = false) override;

Source/BansheeD3D9RenderAPI/Include/BsD3D9HLSLProgramFactory.h

@@ -22,8 +22,7 @@ namespace BansheeEngine
 		const String& getLanguage() const override;
 
 		/**
-		 * @copydoc	GpuProgramFactory::getLanguage(const String&, const String&, GpuProgramType,
-		 *			GpuProgramProfile, bool)
+		 * @copydoc	GpuProgramFactory::create(const String&, const String&, GpuProgramType, GpuProgramProfile, bool)
 		 */
         SPtr<GpuProgramCore> create(const String& source, const String& entryPoint, GpuProgramType gptype, 
 			GpuProgramProfile profile, bool requiresAdjacency) override;

Source/BansheeD3D9RenderAPI/Include/BsD3D9HardwareBufferManager.h

@@ -27,7 +27,7 @@ namespace BansheeEngine
 		/** @copydoc HardwareBufferCoreManager::createGpuParamBlockBufferInternal */
 		SPtr<GpuParamBlockBufferCore> createGpuParamBlockBufferInternal(UINT32 size, GpuParamBlockUsage usage = GPBU_DYNAMIC) override;
 
-		/** @copydoc HardwareBufferCoreManager::createGenericBufferInternal */
+		/** @copydoc HardwareBufferCoreManager::createGpuBufferInternal */
 		SPtr<GpuBufferCore> createGpuBufferInternal(UINT32 elementCount, UINT32 elementSize, 
 			GpuBufferType type, GpuBufferUsage usage, bool randomGpuWrite = false, bool useCounter = false) override;
     };

Source/BansheeD3D9RenderAPI/Include/BsD3D9OcclusionQuery.h

@@ -28,7 +28,7 @@ namespace BansheeEngine
 		/** @copydoc OcclusionQuery::isReady */
 		bool isReady() const override;
 
-		/** @copydoc OcclusionQuery::getNumFragments */
+		/** @copydoc OcclusionQuery::getNumSamples */
 		UINT32 getNumSamples() override;
 
 		/** @copydoc D3D9Resource::notifyOnDeviceCreate */

Source/BansheeD3D9RenderAPI/Include/BsD3D9PixelBuffer.h

@@ -45,7 +45,7 @@ namespace BansheeEngine
 		 * buffer.
 		 *
 		 * @param[in]	dev			Device the volume was created on.
-		 * @param[in]	surface		DirectX 9 object representing the volume.
+		 * @param[in]	volume		DirectX 9 object representing the volume.
 		 * @param[in]	mipTex		Base texture that will be used for generating mipmaps. Usually the parent texture of
 		 *							the volume.
 		 */

Source/BansheeD3D9RenderAPI/Include/BsD3D9Prerequisites.h

@@ -26,6 +26,8 @@
 #include <DxErr.h>
 
 /** @addtogroup Plugins
+ *  @{
+ */
 
 /** @defgroup D3D9 BansheeD3D9RenderAPI
  *	Wrapper around the DirectX 9 render API.

Source/BansheeD3D9RenderAPI/Include/BsD3D9RenderAPI.h

@@ -52,14 +52,14 @@ namespace BansheeEngine
 		void setDrawOperation(DrawOperationType op) override;
 
 		/** @copydoc RenderAPICore::setTexture() */
-		void setTexture(GpuProgramType gptype, UINT16 unit, bool enabled, const SPtr<TextureCore>& texPtr) override;
+		void setTexture(GpuProgramType gptype, UINT16 texUnit, bool enabled, const SPtr<TextureCore>& texPtr) override;
 
 		/** @copydoc RenderAPICore::setLoadStoreTexture() */
-		void setLoadStoreTexture(GpuProgramType gptype, UINT16 unit, bool enabled, const SPtr<TextureCore>& texPtr,
+		void setLoadStoreTexture(GpuProgramType gptype, UINT16 texUnit, bool enabled, const SPtr<TextureCore>& texPtr,
 			const TextureSurface& surface) override;
 
 		/** @copydoc RenderAPICore::setSamplerState() */
-		void setSamplerState(GpuProgramType gptype, UINT16 unit, const SPtr<SamplerStateCore>& state) override;
+		void setSamplerState(GpuProgramType gptype, UINT16 texUnit, const SPtr<SamplerStateCore>& samplerState) override;
 
 		/** @copydoc RenderAPICore::setBlendState() */
 		void setBlendState(const SPtr<BlendStateCore>& blendState) override;
@@ -71,7 +71,7 @@ namespace BansheeEngine
 		void setDepthStencilState(const SPtr<DepthStencilStateCore>& depthStencilState, UINT32 stencilRefValue) override;
 
 		/** @copydoc RenderAPICore::setViewport() */
-		void setViewport(const Rect2& vp) override;
+		void setViewport(const Rect2& area) override;
 
 		/** @copydoc RenderAPICore::beginFrame() */
 		void beginFrame() override;
@@ -142,7 +142,7 @@ namespace BansheeEngine
 		 * @param[in]	outMultisampleQuality	Output parameter containing multisample quality.
 		 */
 		void determineMultisampleSettings(IDirect3DDevice9* d3d9Device, UINT32 multisampleCount, D3DFORMAT d3dPixelFormat,
-			bool fullScreen, D3DMULTISAMPLE_TYPE* outMultisampleType, DWORD* outMultisampleQuality) const;
+			bool fullscreen, D3DMULTISAMPLE_TYPE* outMultisampleType, DWORD* outMultisampleQuality) const;
 
 		/**	Register a newly open window with the render system. */
 		void registerWindow(RenderWindowCore& renderWindow);

Source/BansheeD3D9RenderAPI/Include/BsD3D9RenderAPIFactory.h

@@ -19,10 +19,10 @@ namespace BansheeEngine
 	class D3D9RenderAPIFactory : public RenderAPIFactory
 	{
 	public:
-		/** @copydoc RenderSystemFactory::create */
+		/** @copydoc RenderAPIFactory::create */
 		void create() override;
 
-		/** @copydoc RenderSystemFactory::name */
+		/** @copydoc RenderAPIFactory::name */
 		const String& name() const override { return SystemName; }
 
 	private:

Source/BansheeD3D9RenderAPI/Include/BsD3D9RenderWindow.h

@@ -41,7 +41,7 @@ namespace BansheeEngine
 		void setFullscreen(UINT32 width, UINT32 height, float refreshRate = 60.0f, UINT32 monitorIdx = 0) override;
 
 		/** @copydoc RenderWindowCore::setFullscreen(const VideoMode&) */
-		void setFullscreen(const VideoMode& mode) override;
+		void setFullscreen(const VideoMode& videoMode) override;
 
 		/** @copydoc RenderWindowCore::setWindowed */
 		void setWindowed(UINT32 width, UINT32 height) override;
@@ -70,8 +70,13 @@ namespace BansheeEngine
 		/** @copydoc RenderWindowCore::getCustomAttribute */
 		void getCustomAttribute(const String& name, void* pData) const override;
 
-		/** @copydoc RenderWindowCore::copyContentsToMemory */
-		void copyToMemory(PixelData &dst, FrameBuffer buffer);
+		/** 
+		 * Copies the contents of a frame buffer into the pre-allocated buffer. 
+		 *
+		 * @param[out]	dst		Previously allocated buffer to read the contents into. Must be of valid size.
+		 * @param[in]	buffer	Frame buffer to read the contents from.
+		 */
+		void copyToMemory(PixelData& dst, FrameBuffer buffer);
 
 		/** @copydoc RenderWindowCore::swapBuffers */
 		void swapBuffers() override;

Source/BansheeD3D9RenderAPI/Include/BsD3D9Texture.h

@@ -31,7 +31,7 @@ namespace BansheeEngine
 	public:
 		~D3D9TextureCore();
 
-		/** @copydoc Texture::isBindableAsShaderResource */
+		/** @copydoc TextureCore::isBindableAsShaderResource */
 		bool isBindableAsShaderResource() const override { return mIsBindableAsShaderResource; }
 
 		/**	Returns internal DirectX 9 texture object. */
@@ -85,7 +85,7 @@ namespace BansheeEngine
 		/** @copydoc TextureCore::unlock */
 		void unlockImpl() override;
 
-		/** @copydoc TextureCore::copy */
+		/** @copydoc TextureCore::copyImpl */
 		void copyImpl(UINT32 srcFace, UINT32 srcMipLevel, UINT32 destFace, UINT32 destMipLevel, const SPtr<TextureCore>& target) override;
 
 		/** @copydoc TextureCore::readData */

Source/BansheeEditor/Include/BsEditorPrerequisites.h

@@ -8,7 +8,7 @@
  *  @{
  */
 
-/** @defgroup Editor Editor
+/** @defgroup Editor 4. Editor
  *	Functionality specific to the Banshee Editor.
  *  @{
  */

Source/BansheeEditor/Include/BsGizmoManager.h

@@ -471,6 +471,7 @@ namespace BansheeEngine
 		Vector<SortedIconData> mSortedIconData;
 	};
 
+	/** @} */
 	/** @addtogroup Scene-Editor-Internal
 	 *  @{
 	 */

Source/BansheeEngine/Include/BsGameResourceManager.h

@@ -7,6 +7,10 @@
 
 namespace BansheeEngine
 {
+	/** @addtogroup Resources-Engine-Internal
+	 *  @{
+	 */
+
 	/** 
 	 * Provides a way to map one resource path to another path. Useful if the resources are being referenced using a path
 	 * that is not the path to their physical location.
@@ -103,4 +107,6 @@ namespace BansheeEngine
 	private:
 		SPtr<IGameResourceLoader> mLoader;
 	};
+
+	/** @} */
 }

Source/BansheeEngine/Include/BsPrerequisites.h

@@ -8,7 +8,7 @@
  *  @{
  */
 
-/** @defgroup Engine Engine
+/** @defgroup Engine 3. Engine
  *	Layer that builds upon Core, providing specific implementations of its interfaces as well as other high level systems.
  *  @{
  */
@@ -48,7 +48,7 @@
  */
 
 /** @defgroup Platform-Engine Platform
- *  Platform specific functionality.
+ *  %Platform specific functionality.
  */
 
 /** @defgroup Script Script

Source/BansheeEngine/Include/BsResourceMappingRTTI.h

@@ -1,38 +1,46 @@
-//********************************** Banshee Engine (www.banshee3d.com) **************************************************//
-//**************** Copyright (c) 2016 Marko Pintera ([email protected]). All rights reserved. **********************//
-#pragma once
-
-#include "BsPrerequisites.h"
-#include "BsRTTIType.h"
-#include "BsGameResourceManager.h"
-
-namespace BansheeEngine
-{
-	class BS_EXPORT ResourceMappingRTTI : public RTTIType<ResourceMapping, IReflectable, ResourceMappingRTTI>
-	{
-	private:
-		BS_PLAIN_MEMBER(mMapping)
-
-	public:
-		ResourceMappingRTTI()
-		{
-			BS_ADD_PLAIN_FIELD(mMapping, 0);
-		}
-
-		const String& getRTTIName() override
-		{
-			static String name = "ResourceMapping";
-			return name;
-		}
-
-		UINT32 getRTTIId() override
-		{
-			return TID_ResourceMapping;
-		}
-
-		std::shared_ptr<IReflectable> newRTTIObject() override
-		{
-			return ResourceMapping::create();
-		}
-	};
+//********************************** Banshee Engine (www.banshee3d.com) **************************************************//
+//**************** Copyright (c) 2016 Marko Pintera ([email protected]). All rights reserved. **********************//
+#pragma once
+
+#include "BsPrerequisites.h"
+#include "BsRTTIType.h"
+#include "BsGameResourceManager.h"
+
+namespace BansheeEngine
+{
+	/** @cond RTTI */
+	/** @addtogroup RTTI-Impl-Engine
+	 *  @{
+	 */
+
+	class BS_EXPORT ResourceMappingRTTI : public RTTIType<ResourceMapping, IReflectable, ResourceMappingRTTI>
+	{
+	private:
+		BS_PLAIN_MEMBER(mMapping)
+
+	public:
+		ResourceMappingRTTI()
+		{
+			BS_ADD_PLAIN_FIELD(mMapping, 0);
+		}
+
+		const String& getRTTIName() override
+		{
+			static String name = "ResourceMapping";
+			return name;
+		}
+
+		UINT32 getRTTIId() override
+		{
+			return TID_ResourceMapping;
+		}
+
+		std::shared_ptr<IReflectable> newRTTIObject() override
+		{
+			return ResourceMapping::create();
+		}
+	};
+
+	/** @} */
+	/** @endcond */
 }

Source/BansheeFBXImporter/Include/BsFBXPrerequisites.h

@@ -21,9 +21,11 @@
 #endif
 
 /** @addtogroup Plugins
+ *  @{
+ */
 
 /** @defgroup FBX BansheeFBXImporter
- *	Mesh importer for FBX file format.
+ *	%Mesh importer for the FBX file format.
  */
 
 /** @} */

Source/BansheeFontImporter/Include/BsFontPrerequisites.h

@@ -21,6 +21,8 @@
 #endif
 
 /** @addtogroup Plugins
+ *  @{
+ */
 
 /** @defgroup Font BansheeFontImporter
  *	FreeType importer for font file formats (TTF, OTF).

Source/BansheeFreeImgImporter/Include/BsFreeImgPrerequisites.h

@@ -21,9 +21,11 @@
 #endif
 
 /** @addtogroup Plugins
+ *  @{
+ */
 
 /** @defgroup FreeImg BansheeFreeImgImporter
- *	FreeImg importer for importing most popular image formats (for example PSD, PNG, JPG, etc.).
+ *	FreeImg importer for import of most popular image formats (for example PSD, PNG, JPG, etc.).
  */
 
 /** @} */

Source/BansheeGLRenderAPI/Include/BsGLGpuParamBlockBuffer.h

@@ -18,10 +18,10 @@ namespace BansheeEngine
 		GLGpuParamBlockBufferCore(UINT32 size, GpuParamBlockUsage usage);
 		~GLGpuParamBlockBufferCore();
 
-		/** @copydoc GpuParamBlockBufferCore::writeData */
+		/** @copydoc GpuParamBlockBufferCore::writeToGPU */
 		void writeToGPU(const UINT8* data) override;
 
-		/** @copydoc GpuParamBlockBufferCore::readData */
+		/** @copydoc GpuParamBlockBufferCore::readFromGPU */
 		void readFromGPU(UINT8* data) const override;
 
 		/**	Returns internal OpenGL uniform buffer handle. */

Source/BansheeGLRenderAPI/Include/BsGLHardwareBufferManager.h

@@ -22,17 +22,17 @@ namespace BansheeEngine
         static GLenum getGLType(VertexElementType type);
 
 	protected:
-		/** @copydoc HardwareBufferCoreManager::createVertexBufferImpl */
+		/** @copydoc HardwareBufferCoreManager::createVertexBufferInternal */
         SPtr<VertexBufferCore> createVertexBufferInternal(UINT32 vertexSize, 
 			UINT32 numVerts, GpuBufferUsage usage, bool streamOut = false) override;
 
-		/** @copydoc HardwareBufferCoreManager::createIndexBufferImpl */
+		/** @copydoc HardwareBufferCoreManager::createIndexBufferInternal */
 		SPtr<IndexBufferCore> createIndexBufferInternal(IndexType itype, UINT32 numIndexes, GpuBufferUsage usage) override;
 
 		/** @copydoc HardwareBufferCoreManager::createGpuParamBlockBufferInternal */
 		SPtr<GpuParamBlockBufferCore> createGpuParamBlockBufferInternal(UINT32 size, GpuParamBlockUsage usage = GPBU_DYNAMIC) override;
 
-		/** @copydoc HardwareBufferCoreManager::createGenericBufferInternal */
+		/** @copydoc HardwareBufferCoreManager::createGpuBufferInternal */
 		SPtr<GpuBufferCore> createGpuBufferInternal(UINT32 elementCount, UINT32 elementSize, 
 			GpuBufferType type, GpuBufferUsage usage, bool randomGpuWrite = false, bool useCounter = false) override;
     };

Source/BansheeGLRenderAPI/Include/BsGLIndexBuffer.h

@@ -19,10 +19,10 @@ namespace BansheeEngine
 		~GLIndexBufferCore();
 
 		/** @copydoc IndexBufferCore::readData */
-        void readData(UINT32 offset, UINT32 length, void* pDest) override;
+        void readData(UINT32 offset, UINT32 length, void* dest) override;
 
 		/** @copydoc IndexBufferCore::writeData */
-        void writeData(UINT32 offset, UINT32 length, const void* pSource, 
+        void writeData(UINT32 offset, UINT32 length, const void* source, 
 			BufferWriteType writeFlags = BufferWriteType::Normal) override;
 
 		/**	Returns internal OpenGL index buffer handle. */

Source/BansheeGLRenderAPI/Include/BsGLOcclusionQuery.h

@@ -27,7 +27,7 @@ namespace BansheeEngine
 		/** @copydoc OcclusionQuery::isReady */
 		bool isReady() const override;
 
-		/** @copydoc OcclusionQuery::getNumFragments */
+		/** @copydoc OcclusionQuery::getNumSamples */
 		UINT32 getNumSamples() override;
 
 	private:

Source/BansheeGLRenderAPI/Include/BsGLPixelBuffer.h

@@ -26,8 +26,7 @@ namespace BansheeEngine
 		 * @param[in]	format			Format of each pixel in the buffer.
 		 * @param[in]	usage			Usage signaling the render system how we plan on using the buffer.
 		 */
-		GLPixelBuffer(UINT32 mWidth, UINT32 mHeight, UINT32 mDepth,
-			PixelFormat mFormat, GpuBufferUsage usage);
+		GLPixelBuffer(UINT32 width, UINT32 height, UINT32 depth, PixelFormat format, GpuBufferUsage usage);
 
 		~GLPixelBuffer();
 

Source/BansheeGLRenderAPI/Include/BsGLPrerequisites.h

@@ -60,6 +60,8 @@
 #endif
 
 /** @addtogroup Plugins
+ *  @{
+ */
 
 /** @defgroup GL BansheeGLRenderAPI
  *	Wrapper around the OpenGL render API.

Source/BansheeGLRenderAPI/Include/BsGLRenderAPI.h

@@ -46,14 +46,14 @@ namespace BansheeEngine
 		void setScissorRect(UINT32 left, UINT32 top, UINT32 right, UINT32 bottom) override;
 
 		/** @copydoc RenderAPICore::setTexture() */
-		void setTexture(GpuProgramType gptype, UINT16 unit, bool enabled, const SPtr<TextureCore>& tex) override;
+		void setTexture(GpuProgramType gptype, UINT16 texUnit, bool enabled, const SPtr<TextureCore>& texPtr) override;
 
 		/** @copydoc RenderAPICore::setLoadStoreTexture */
-		void setLoadStoreTexture(GpuProgramType gptype, UINT16 unit, bool enabled, const SPtr<TextureCore>& texPtr,
+		void setLoadStoreTexture(GpuProgramType gptype, UINT16 texUnit, bool enabled, const SPtr<TextureCore>& texPtr,
 			const TextureSurface& surface) override;
         
 		/** @copydoc RenderAPICore::setSamplerState() */
-		void setSamplerState(GpuProgramType gptype, UINT16 unit, const SPtr<SamplerStateCore>& state) override;
+		void setSamplerState(GpuProgramType gptype, UINT16 texUnit, const SPtr<SamplerStateCore>& samplerState) override;
 
 		/** @copydoc RenderAPICore::setBlendState() */
 		void setBlendState(const SPtr<BlendStateCore>& blendState) override;
@@ -128,7 +128,7 @@ namespace BansheeEngine
 		/** @copydoc RenderAPICore::initializeFinalize */
 		void initializeFinalize(const SPtr<RenderWindowCore>& primaryWindow) override;
 
-		/** @copydoc RenderAPICore::destroyCore. */
+		/** @copydoc RenderAPICore::destroyCore */
 		void destroyCore() override;
 
 		/**	Call before doing a draw operation, this method sets everything up. */
@@ -356,7 +356,7 @@ namespace BansheeEngine
 		 * @param[in] ccw	If set to true, the stencil operations will be applied to counterclockwise
 		 *					faces. Otherwise they will be applied to clockwise faces.
 		 */
-		void setStencilBufferFunc(CompareFunction func = CMPF_ALWAYS_PASS, UINT32 mask = 0xFFFFFFFF, bool front = true);
+		void setStencilBufferFunc(CompareFunction func = CMPF_ALWAYS_PASS, UINT32 mask = 0xFFFFFFFF, bool ccw = true);
 
 		/**	The bitmask applied to the stencil value before writing it to the stencil buffer. */
 		void setStencilBufferWriteMask(UINT32 mask = 0xFFFFFFFF);

Source/BansheeGLRenderAPI/Include/BsGLRenderAPIFactory.h

@@ -19,10 +19,10 @@ namespace BansheeEngine
 	class GLRenderAPIFactory : public RenderAPIFactory
 	{
 	public:
-		/** @copydoc RenderSystemFactory::create */
+		/** @copydoc RenderAPIFactory::create */
 		void create() override;
 
-		/** @copydoc RenderSystemFactory::name */
+		/** @copydoc RenderAPIFactory::name */
 		const String& name() const override { return SystemName; }
 
 	private:

Source/BansheeGLRenderAPI/Include/BsGLSupport.h

@@ -38,8 +38,6 @@ namespace BansheeEngine
 		 *
 		 * @param[in]	desc			Description of a render window to create.
 		 * @param[in]	windowId		Window ID provided by the render window manager.
-		 * @param[in]	parentWindow	Optional parent window if the window shouldn't be a main window. First created
-		 *								window cannot have a parent.
 		 * @return						Returns newly created window.
 		 */
 		virtual SPtr<RenderWindowCore> newWindowCore(RENDER_WINDOW_DESC& desc, UINT32 windowId) = 0;

Source/BansheeGLRenderAPI/Include/BsGLTexture.h

@@ -53,7 +53,7 @@ namespace BansheeEngine
 		/** @copydoc TextureCore::unlock */
 		void unlockImpl() override;
 
-		/** @copydoc TextureCore::copy */
+		/** @copydoc TextureCore::copyImpl */
 		void copyImpl(UINT32 srcFace, UINT32 srcMipLevel, UINT32 destFace, UINT32 destMipLevel, const SPtr<TextureCore>& target) override;
 
 		/** @copydoc TextureCore::readData */

Source/BansheeGLRenderAPI/Include/BsGLVertexBuffer.h

@@ -20,10 +20,10 @@ namespace BansheeEngine
 		~GLVertexBufferCore();
 
 		/** @copydoc VertexBufferCore::readData */
-        void readData(UINT32 offset, UINT32 length, void* pDest) override;
+        void readData(UINT32 offset, UINT32 length, void* dest) override;
 
 		/** @copydoc VertexBufferCore::writeData */
-        void writeData(UINT32 offset, UINT32 length, const void* pSource, 
+        void writeData(UINT32 offset, UINT32 length, const void* source, 
 			BufferWriteType writeFlags = BufferWriteType::Normal) override;
 
 		/**	Returns internal OpenGL buffer ID. */
@@ -42,7 +42,7 @@ namespace BansheeEngine
 		/** @copydoc VertexBufferCore::lockImpl */
 		void* lockImpl(UINT32 offset, UINT32 length, GpuLockOptions options) override;
 
-		/** @copydod VertexBufferCore::unlockImpl */
+		/** @copydoc VertexBufferCore::unlockImpl */
 		void unlockImpl() override;
 
 	private:

Source/BansheeGLRenderAPI/Include/Win32/BsWin32GLSupport.h

@@ -56,7 +56,7 @@ namespace BansheeEngine
 		 * @param[in]	depth		Should the pixel format contain the depth/stencil buffer.
 		 * @return					True if a pixel format was successfully set.
 		 */
-		bool selectPixelFormat(HDC hdc, int colorDepth, int multisample, bool hwGamma, bool depthStencil);
+		bool selectPixelFormat(HDC hdc, int colorDepth, int multisample, bool hwGamma, bool depth);
 
 		/** @copydoc GLSupport::getVideoModeInfo */
 		VideoModeInfoPtr getVideoModeInfo() const override;

Source/BansheeGLRenderAPI/Include/Win32/BsWin32RenderWindow.h

@@ -40,7 +40,7 @@ namespace BansheeEngine
 		void setFullscreen(UINT32 width, UINT32 height, float refreshRate = 60.0f, UINT32 monitorIdx = 0) override;
 
 		/** @copydoc RenderWindowCore::setFullscreen(const VideoMode&) */
-		void setFullscreen(const VideoMode& mode) override;
+		void setFullscreen(const VideoMode& videoMode) override;
 
 		/** @copydoc RenderWindowCore::setWindowed */
 		void setWindowed(UINT32 width, UINT32 height) override;
@@ -63,8 +63,13 @@ namespace BansheeEngine
 		/** @copydoc RenderWindowCore::resize */
 		void resize(UINT32 width, UINT32 height) override;
 
-		/** @copydoc RenderWindowCore::copyContentsToMemory */
-		void copyToMemory(PixelData &dst, FrameBuffer buffer);
+		/** 
+		 * Copies the contents of a frame buffer into the pre-allocated buffer. 
+		 *
+		 * @param[out]	dst		Previously allocated buffer to read the contents into. Must be of valid size.
+		 * @param[in]	buffer	Frame buffer to read the contents from.
+		 */
+		void copyToMemory(PixelData& dst, FrameBuffer buffer);
 
 		/** @copydoc RenderWindowCore::swapBuffers */
 		void swapBuffers() override;

Source/BansheeMono/Include/BsMonoMethod.h

@@ -25,7 +25,7 @@ namespace BansheeEngine
 		 * method of the class this object was retrieved from. Use invokeVirtual() if you need polymorphism.
 		 *
 		 * @param[in]	instance	Instance of the object to invoke the method on. Can be null for static methods.
-		 * @param[in]	param		Array of parameters to pass to the method. Caller must ensure they match method 
+		 * @param[in]	params		Array of parameters to pass to the method. Caller must ensure they match method 
 		 *							parameter count and type. For value types parameters should be pointers to the 
 		 *							values and for reference types they should be pointers to MonoObject.
 		 * @return					A boxed return value, or null if method has no return value.
@@ -37,7 +37,7 @@ namespace BansheeEngine
 		 * called.
 		 *
 		 * @param[in]	instance	Instance of the object to invoke the method on.
-		 * @param[in]	param		Array of parameters to pass to the method. Caller must ensure they match method 
+		 * @param[in]	params		Array of parameters to pass to the method. Caller must ensure they match method 
 		 *							parameter count and type. For value types parameters should be pointers to the 
 		 *							values and for reference types they should be pointers to MonoObject.
 		 * @return					A boxed return value, or null if method has no return value.

Source/BansheeMono/Include/BsMonoPrerequisites.h

@@ -21,6 +21,8 @@
 #endif
 
 /** @addtogroup Plugins
+ *  @{
+ */
 
 /** @defgroup Mono BansheeMono
  *	Scripting language backend using Mono's CLR.

Source/BansheeMono/Include/BsMonoUtil.h

@@ -121,7 +121,7 @@ namespace BansheeEngine
 			}
 		}
 
-		/** @copydoc throwIfException */
+		/** @copydoc throwIfException(MonoObject*) */
 		static void throwIfException(MonoException* exception)
 		{
 			throwIfException(reinterpret_cast<MonoObject*>(exception));

Source/BansheeOISInput/Include/BsOISPrerequisites.h

@@ -21,6 +21,8 @@
 #endif
 
 /** @addtogroup Plugins
+ *  @{
+ */
 
 /** @defgroup OISInput BansheeOISInput
  *	OIS implementation for raw keyboard/mouse/gamepad input.

Source/BansheePhysX/Include/BsPhysX.h

@@ -105,7 +105,7 @@ namespace BansheeEngine
 		/** @copydoc Physics::createCharacterController*/
 		SPtr<CharacterController> createCharacterController(const CHAR_CONTROLLER_DESC& desc) override;
 
-		/** @copydoc Physics::rayCast(const Vector3&, const Vector3&, UINT64, float) */
+		/** @copydoc Physics::rayCast(const Vector3&, const Vector3&, PhysicsQueryHit&, UINT64, float) const */
 		bool rayCast(const Vector3& origin, const Vector3& unitDir, PhysicsQueryHit& hit,
 			UINT64 layer = BS_ALL_LAYERS, float max = FLT_MAX) const override;
 
@@ -125,7 +125,7 @@ namespace BansheeEngine
 		bool convexCast(const HPhysicsMesh& mesh, const Vector3& position, const Quaternion& rotation,
 			const Vector3& unitDir, PhysicsQueryHit& hit, UINT64 layer = BS_ALL_LAYERS, float max = FLT_MAX) const override;
 
-		/** @copydoc Physics::rayCastAll(const Vector3&, const Vector3&, UINT64, float) */
+		/** @copydoc Physics::rayCastAll(const Vector3&, const Vector3&, UINT64, float) const */
 		Vector<PhysicsQueryHit> rayCastAll(const Vector3& origin, const Vector3& unitDir,
 			UINT64 layer = BS_ALL_LAYERS, float max = FLT_MAX) const override;
 
@@ -146,7 +146,7 @@ namespace BansheeEngine
 			const Quaternion& rotation, const Vector3& unitDir, UINT64 layer = BS_ALL_LAYERS, 
 			float max = FLT_MAX) const override;
 
-		/** @copydoc Physics::rayCastAny(const Vector3&, const Vector3&, UINT64, float) */
+		/** @copydoc Physics::rayCastAny(const Vector3&, const Vector3&, UINT64, float) const */
 		bool rayCastAny(const Vector3& origin, const Vector3& unitDir,
 			UINT64 layer = BS_ALL_LAYERS, float max = FLT_MAX) const override;
 

Source/BansheePhysX/Include/BsPhysXPrerequisites.h

@@ -25,9 +25,11 @@ namespace BansheeEngine
 #endif
 
 /** @addtogroup Plugins
+ *  @{
+ */
 
 /** @defgroup PhysX BansheePhysX
- *	NVIDIA PhysX implementation of Banshee's physics.
+ *	NVIDIA %PhysX implementation of Banshee's physics.
  *  @{
  */
 
@@ -105,7 +107,7 @@ namespace BansheeEngine
 		CCD = 1 << 3 /**< Use continous collision detection for this shape. */
 	};
 
-	/** @copydoc ObjectFilterFlag */
+	/** @copydoc PhysXObjectFilterFlag */
 	typedef Flags<PhysXObjectFilterFlag> PhysXObjectFilterFlags;
 	BS_FLAGS_OPERATORS(PhysXObjectFilterFlag)
 

Source/BansheeSL/Include/BsSLPrerequisites.h

@@ -21,6 +21,8 @@
 #endif
 
 /** @addtogroup Plugins
+ *  @{
+ */
 
 /** @defgroup BansheeSL BansheeSL
  *	Implementation of the Banshee Shading Language.

Source/BansheeUtility/Include/BsPrerequisitesUtil.h

@@ -9,7 +9,7 @@
  *  @{
  */
 
-/** @defgroup Utility Utility
+/** @defgroup Utility 1. Utility
  *	Lowest layer of the engine containing a collection of very decoupled and separate systems that are 
  *  likely to be used throughout all of the higher layers.
  *  @{
@@ -74,7 +74,7 @@
 /** @endcond */
 
 /** @defgroup Platform-Utility Platform
- *  Platform specific functionality.
+ *  %Platform specific functionality.
  */
 
 /** @defgroup Internal-Utility [INTERNAL]

Source/RenderBeast/Include/BsRenderBeastPrerequisites.h

@@ -21,6 +21,8 @@
 #endif
 
 /** @addtogroup Plugins
+ *  @{
+ */
 
 /** @defgroup RenderBeast RenderBeast
  *	Banshee's default renderer implementation.

Source/RenderBeast/Include/BsStaticRenderableHandler.h

@@ -1,87 +1,87 @@
-//********************************** Banshee Engine (www.banshee3d.com) **************************************************//
-//**************** Copyright (c) 2016 Marko Pintera ([email protected]). All rights reserved. **********************//
-#pragma once
-
-#include "BsRenderBeastPrerequisites.h"
-#include "BsRenderableHandler.h"
-#include "BsGpuParamDesc.h"
-#include "BsGpuParam.h"
-#include "BsRenderableElement.h"
-#include "BsRenderBeast.h"
-#include "BsParamBlocks.h"
-
-namespace BansheeEngine
-{
-	/** @addtogroup RenderBeast
-	 *  @{
-	 */
-
-	BS_PARAM_BLOCK_BEGIN(PerFrameParamBuffer)
-		BS_PARAM_BLOCK_ENTRY(float, gTime)
-	BS_PARAM_BLOCK_END
-
-	BS_PARAM_BLOCK_BEGIN(PerCameraParamBuffer)
-		BS_PARAM_BLOCK_ENTRY(Vector3, gViewDir)
-		BS_PARAM_BLOCK_ENTRY(Vector3, gViewOrigin)
-		BS_PARAM_BLOCK_ENTRY(Matrix4, gMatViewProj)
-		BS_PARAM_BLOCK_ENTRY(Matrix4, gMatView)
-		BS_PARAM_BLOCK_ENTRY(Matrix4, gMatProj)
-		BS_PARAM_BLOCK_ENTRY(Matrix4, gMatInvProj)
-		BS_PARAM_BLOCK_ENTRY(Matrix4, gMatInvViewProj)
-		BS_PARAM_BLOCK_ENTRY(Matrix4, gMatScreenToWorld)
-		BS_PARAM_BLOCK_ENTRY(Vector2, gDeviceZToWorldZ)
-		BS_PARAM_BLOCK_ENTRY(Vector4, gClipToUVScaleOffset)
-	BS_PARAM_BLOCK_END
-
-	BS_PARAM_BLOCK_BEGIN(PerObjectParamBuffer)
-		BS_PARAM_BLOCK_ENTRY(Matrix4, gMatWorldViewProj)
-		BS_PARAM_BLOCK_ENTRY(Matrix4, gMatWorld)
-		BS_PARAM_BLOCK_ENTRY(Matrix4, gMatInvWorld)
-		BS_PARAM_BLOCK_ENTRY(Matrix4, gMatWorldNoScale)
-		BS_PARAM_BLOCK_ENTRY(Matrix4, gMatInvWorldNoScale)
-		BS_PARAM_BLOCK_ENTRY(float, gWorldDeterminantSign)
-	BS_PARAM_BLOCK_END
-
-	/** Renderable handler that manages initializing, updating and rendering of static renderable objects. */
-	class BS_BSRND_EXPORT StaticRenderableHandler : public RenderableHandler
-	{
-	public:
-		/** Contains lit tex renderable data unique for each object. */
-		struct PerObjectData
-		{
-			Vector<RenderableElement::BufferBindInfo> perObjectBuffers;
-		};
-
-		StaticRenderableHandler();
-
-		/** @copydoc RenderableController::initializeRenderElem */
-		void initializeRenderElem(RenderableElement& element) override;
-
-		/** @copydoc RenderableController::bindPerObjectBuffers */
-		void bindPerObjectBuffers(const RenderableElement& element) override;
-
-		/** Updates global per frame parameter buffers with new values. To be called at the start of every frame. */
-		void updatePerFrameBuffers(float time);
-
-		/**
-		 * Updates global per frame parameter buffers with new values. To be called at the start of rendering for every 
-		 * camera.
-		 */
-		void updatePerCameraBuffers(const CameraShaderData& cameraData);
-
-		/**
-		 * Updates object specific parameter buffers with new values. To be called whenever object specific values change.
-		 */
-		void updatePerObjectBuffers(RenderableElement& element, const RenderableShaderData& data, const Matrix4& wvpMatrix);
-
-		/** Returns a buffer that stores per-camera parameters. */
-		const PerCameraParamBuffer& getPerCameraParams() const { return mPerCameraParams; }
-
-	protected:
-		PerFrameParamBuffer mPerFrameParams;
-		PerCameraParamBuffer mPerCameraParams;
-		PerObjectParamBuffer mPerObjectParams;
-	};
-
-	/** @} */
+//********************************** Banshee Engine (www.banshee3d.com) **************************************************//
+//**************** Copyright (c) 2016 Marko Pintera ([email protected]). All rights reserved. **********************//
+#pragma once
+
+#include "BsRenderBeastPrerequisites.h"
+#include "BsRenderableHandler.h"
+#include "BsGpuParamDesc.h"
+#include "BsGpuParam.h"
+#include "BsRenderableElement.h"
+#include "BsRenderBeast.h"
+#include "BsParamBlocks.h"
+
+namespace BansheeEngine
+{
+	/** @addtogroup RenderBeast
+	 *  @{
+	 */
+
+	BS_PARAM_BLOCK_BEGIN(PerFrameParamBuffer)
+		BS_PARAM_BLOCK_ENTRY(float, gTime)
+	BS_PARAM_BLOCK_END
+
+	BS_PARAM_BLOCK_BEGIN(PerCameraParamBuffer)
+		BS_PARAM_BLOCK_ENTRY(Vector3, gViewDir)
+		BS_PARAM_BLOCK_ENTRY(Vector3, gViewOrigin)
+		BS_PARAM_BLOCK_ENTRY(Matrix4, gMatViewProj)
+		BS_PARAM_BLOCK_ENTRY(Matrix4, gMatView)
+		BS_PARAM_BLOCK_ENTRY(Matrix4, gMatProj)
+		BS_PARAM_BLOCK_ENTRY(Matrix4, gMatInvProj)
+		BS_PARAM_BLOCK_ENTRY(Matrix4, gMatInvViewProj)
+		BS_PARAM_BLOCK_ENTRY(Matrix4, gMatScreenToWorld)
+		BS_PARAM_BLOCK_ENTRY(Vector2, gDeviceZToWorldZ)
+		BS_PARAM_BLOCK_ENTRY(Vector4, gClipToUVScaleOffset)
+	BS_PARAM_BLOCK_END
+
+	BS_PARAM_BLOCK_BEGIN(PerObjectParamBuffer)
+		BS_PARAM_BLOCK_ENTRY(Matrix4, gMatWorldViewProj)
+		BS_PARAM_BLOCK_ENTRY(Matrix4, gMatWorld)
+		BS_PARAM_BLOCK_ENTRY(Matrix4, gMatInvWorld)
+		BS_PARAM_BLOCK_ENTRY(Matrix4, gMatWorldNoScale)
+		BS_PARAM_BLOCK_ENTRY(Matrix4, gMatInvWorldNoScale)
+		BS_PARAM_BLOCK_ENTRY(float, gWorldDeterminantSign)
+	BS_PARAM_BLOCK_END
+
+	/** Renderable handler that manages initializing, updating and rendering of static renderable objects. */
+	class BS_BSRND_EXPORT StaticRenderableHandler : public RenderableHandler
+	{
+	public:
+		/** Contains lit tex renderable data unique for each object. */
+		struct PerObjectData
+		{
+			Vector<RenderableElement::BufferBindInfo> perObjectBuffers;
+		};
+
+		StaticRenderableHandler();
+
+		/** @copydoc RenderableHandler::initializeRenderElem */
+		void initializeRenderElem(RenderableElement& element) override;
+
+		/** @copydoc RenderableHandler::bindPerObjectBuffers */
+		void bindPerObjectBuffers(const RenderableElement& element) override;
+
+		/** Updates global per frame parameter buffers with new values. To be called at the start of every frame. */
+		void updatePerFrameBuffers(float time);
+
+		/**
+		 * Updates global per frame parameter buffers with new values. To be called at the start of rendering for every 
+		 * camera.
+		 */
+		void updatePerCameraBuffers(const CameraShaderData& cameraData);
+
+		/**
+		 * Updates object specific parameter buffers with new values. To be called whenever object specific values change.
+		 */
+		void updatePerObjectBuffers(RenderableElement& element, const RenderableShaderData& data, const Matrix4& wvpMatrix);
+
+		/** Returns a buffer that stores per-camera parameters. */
+		const PerCameraParamBuffer& getPerCameraParams() const { return mPerCameraParams; }
+
+	protected:
+		PerFrameParamBuffer mPerFrameParams;
+		PerCameraParamBuffer mPerCameraParams;
+		PerObjectParamBuffer mPerObjectParams;
+	};
+
+	/** @} */
 }

Source/SBansheeEditor/Include/BsScriptEditorPrerequisites.h

@@ -22,15 +22,16 @@
 #endif
 
 /** @addtogroup Plugins
+ *  @{
+ */
 
 /** @defgroup SBansheeEditor SBansheeEditor
- *	Contains script interop objects and other scripting functionality for BansheeEditor.
+ *	Contains script interop objects and other scripting functionality for the editor layer.
  *  @{
  */
 
-/** @defgroup ScriptInteropEditor Script interop objects
+/** @defgroup ScriptInteropEditor Interop
  *	Script interop objects for communicating between native code and MBansheeEditor managed assembly.
- *  @{
  */
 
 /** @} */

Source/SBansheeEngine/Include/BsManagedComponentRTTI.h

@@ -13,6 +13,7 @@
 
 namespace BansheeEngine
 {
+	/** @cond RTTI */
 	/** @addtogroup RTTI-Impl-SEngine
 	 *  @{
 	 */
@@ -104,4 +105,5 @@ namespace BansheeEngine
 	};
 
 	/** @} */
+	/** @endcond */
 }

Source/SBansheeEngine/Include/BsManagedResourceMetaDataRTTI.h

@@ -8,6 +8,7 @@
 
 namespace BansheeEngine
 {
+	/** @cond RTTI */
 	/** @addtogroup RTTI-Impl-SEngine
 	 *  @{
 	 */
@@ -60,4 +61,5 @@ namespace BansheeEngine
 	};
 
 	/** @} */
+	/** @endcond */
 }

Source/SBansheeEngine/Include/BsManagedResourceRTTI.h

@@ -12,6 +12,7 @@
 
 namespace BansheeEngine
 {
+	/** @cond RTTI */
 	/** @addtogroup RTTI-Impl-SEngine
 	 *  @{
 	 */
@@ -72,4 +73,5 @@ namespace BansheeEngine
 	};
 
 	/** @} */
+	/** @endcond */
 }

Source/SBansheeEngine/Include/BsManagedSerializableArrayRTTI.h

@@ -12,6 +12,7 @@
 
 namespace BansheeEngine
 {
+	/** @cond RTTI */
 	/** @addtogroup RTTI-Impl-SEngine
 	 *  @{
 	 */
@@ -108,4 +109,5 @@ namespace BansheeEngine
 	};
 
 	/** @} */
+	/** @endcond */
 }

Source/SBansheeEngine/Include/BsManagedSerializableDictionaryRTTI.h

@@ -8,6 +8,7 @@
 
 namespace BansheeEngine
 {
+	/** @cond RTTI */
 	/** @addtogroup RTTI-Impl-SEngine
 	 *  @{
 	 */
@@ -135,4 +136,5 @@ namespace BansheeEngine
 	};
 
 	/** @} */
+	/** @endcond */
 }

Source/SBansheeEngine/Include/BsManagedSerializableDiffRTTI.h

@@ -8,6 +8,7 @@
 
 namespace BansheeEngine
 {
+	/** @cond RTTI */
 	/** @addtogroup RTTI-Impl-SEngine
 	 *  @{
 	 */
@@ -452,4 +453,5 @@ namespace BansheeEngine
 	};
 
 	/** @} */
+	/** @endcond */
 }

Source/SBansheeEngine/Include/BsManagedSerializableFieldRTTI.h

@@ -9,6 +9,7 @@
 
 namespace BansheeEngine
 {
+	/** @cond RTTI */
 	/** @addtogroup RTTI-Impl-SEngine
 	 *  @{
 	 */
@@ -659,4 +660,5 @@ namespace BansheeEngine
 	};
 
 	/** @} */
+	/** @endcond */
 }

Source/SBansheeEngine/Include/BsManagedSerializableListRTTI.h

@@ -8,6 +8,7 @@
 
 namespace BansheeEngine
 {
+	/** @cond RTTI */
 	/** @addtogroup RTTI-Impl-SEngine
 	 *  @{
 	 */
@@ -82,4 +83,5 @@ namespace BansheeEngine
 	};
 
 	/** @} */
+	/** @endcond */
 }

Source/SBansheeEngine/Include/BsManagedSerializableObjectInfoRTTI.h

@@ -9,6 +9,7 @@
 
 namespace BansheeEngine
 {
+	/** @cond RTTI */
 	/** @addtogroup RTTI-Impl-SEngine
 	 *  @{
 	 */
@@ -541,4 +542,5 @@ namespace BansheeEngine
 	};
 
 	/** @} */
+	/** @endcond */
 }

Source/SBansheeEngine/Include/BsManagedSerializableObjectRTTI.h

@@ -11,6 +11,7 @@
 
 namespace BansheeEngine
 {
+	/** @cond RTTI */
 	/** @addtogroup RTTI-Impl-SEngine
 	 *  @{
 	 */
@@ -117,4 +118,5 @@ namespace BansheeEngine
 	};
 
 	/** @} */
+	/** @endcond */
 }

Source/SBansheeEngine/Include/BsScriptEnginePrerequisites.h

@@ -25,17 +25,19 @@
  */
 
 /** @defgroup SBansheeEngine SBansheeEngine
- *	Contains script interop objects and other scripting functionality for BansheeEngine.
+ *	Contains script interop objects and other scripting functionality for the engine layer.
  *  @{
  */
 
-/** @defgroup ScriptInteropEngine Script interop objects
+/** @defgroup ScriptInteropEngine Interop
  *	Script interop objects for communicating between native code and MBansheeEngine managed assembly.
  */
 
+/** @cond RTTI */
 /** @defgroup RTTI-Impl-SEngine RTTI types
  *	Types containing RTTI for specific classes.
  */
+/** @endcond */
 
 /** @} */
 /** @} */

Source/SBansheeEngine/Include/BsScriptObject.h

@@ -100,7 +100,10 @@ namespace BansheeEngine
 		virtual ~ScriptObject() 
 		{ }
 
-		/** @copydoc ScriptObjectBase::_clearManagedInstance */
+		/**	
+		 * Clears any managed instance references from the interop object. Normally called right after the assemblies are
+		 * unloaded.
+		 */
 		void _clearManagedInstance()
 		{
 			if (metaData.thisPtrField != nullptr && mManagedInstance != nullptr)
@@ -109,7 +112,7 @@ namespace BansheeEngine
 			mManagedInstance = nullptr;
 		}
 
-		/** @copydoc ScriptObjectBase::_restoreManagedInstance */
+		/**	Allows persistent objects to restore their managed instances after assembly reload. */
 		void _restoreManagedInstance()
 		{
 			mManagedInstance = _createManagedInstance(true);

Source/SBansheeEngine/Include/BsScriptResource.h

@@ -56,10 +56,10 @@ namespace BansheeEngine
 	class BS_SCR_BE_EXPORT TScriptResource : public ScriptObject <ScriptClass, ScriptResourceBase>
 	{
 	public:
-		/** @copydoc ScriptResourceBase::getGenericHandle */
+		/**	Returns a generic handle to the internal wrapped resource. */
 		HResource getGenericHandle() const override { return mResource; }
 
-		/** @copydoc ScriptResourceBase::setResource */
+		/**	Sets the internal resource this object wraps. */
 		void setResource(const HResource& resource) override { mResource = static_resource_cast<ResType>(resource); }
 
 		/**	Returns a handle to the internal wrapped resource. */
@@ -78,7 +78,10 @@ namespace BansheeEngine
 
 		virtual ~TScriptResource() {}
 
-		/** @copydoc ScriptObjectBase::endRefresh */
+		/**
+		 * Called after assembly reload starts to give the object a chance to restore the data backed up by the previous
+		 * beginRefresh() call.
+		 */
 		virtual void endRefresh(const ScriptObjectBackup& backupData) override
 		{
 			BS_ASSERT(!mHandleValid);
@@ -87,14 +90,16 @@ namespace BansheeEngine
 			ScriptObject::endRefresh(backupData);
 		}
 
-		/** @copydoc ScriptObjectBase::notifyResourceDestroyed */
+		/**	
+		 * Triggered by the script resource managed when the native resource handle this object point to has been destroyed.
+		 */
 		void notifyResourceDestroyed() override
 		{
 			mono_gchandle_free(mManagedHandle);
 			BS_DEBUG_ONLY(mHandleValid = false);
 		}
 
-		/** @copydoc ScriptObjectBase::_onManagedInstanceDeleted */
+		/**	Called when the managed instance gets finalized by the CLR. */
 		void _onManagedInstanceDeleted() override
 		{
 			mono_gchandle_free(mManagedHandle);

Source/SBansheeEngine/Include/BsScriptResourceRef.h

@@ -36,6 +36,7 @@ namespace BansheeEngine
 		 * Creates a new managed ResourceRef for the provided texture.
 		 *
 		 * @param[in]	handle	Handle to the texture to wrap.
+		 * @param[in]	type	Type of texture the handle holds.
 		 */
 		static MonoObject* create(const WeakResourceHandle<Texture>& handle, TextureType type = TEX_TYPE_2D);