Code cleanup.

Engine/Core/StringHash.h

@@ -87,8 +87,6 @@ public:
     operator bool () const { return value_ != 0; }
     /// Return hash value.
     unsigned GetValue() const { return value_; }
-    /// Return unsigned data.
-    const unsigned* GetData() const { return &value_; }
     /// Return as string.
     String ToString() const;
     /// Return hash value for HashSet & HashMap.
@@ -172,8 +170,6 @@ public:
     operator bool () const { return value_ != 0; }
     /// Return hash value.
     unsigned short GetValue() const { return value_; }
-    /// Return unsigned short data.
-    const unsigned short* GetData() const { return &value_; }
     /// Return as string.
     String ToString() const;
     /// Return hash value for HashSet & HashMap.

Engine/Graphics/BillboardSet.h

@@ -65,8 +65,6 @@ public:
     
     /// Calculate distance and LOD level for rendering.  May be called from worker thread(s), possibly re-entrantly.
     virtual void UpdateDistance(const FrameInfo& frame);
-    /// Return whether the next geometry update will touch actual GPU resources.
-    virtual bool GetUpdateOnGPU() { return true; }
     /// Prepare geometry for rendering. Called from a worker thread if possible (no GPU update.)
     virtual void UpdateGeometry(const FrameInfo& frame);
     /// Return whether a geometry update is necessary, and if it should happen in a worker thread.

Engine/Graphics/Direct3D9/D3D9Graphics.cpp

@@ -756,7 +756,7 @@ bool Graphics::SetVertexBuffers(const Vector<VertexBuffer*>& buffers, const PODV
         if (!buffers[i])
             continue;
         
-        hash |= buffers[i]->GetHash(i, elementMasks[i]);
+        hash |= buffers[i]->GetBufferHash(i, elementMasks[i]);
     }
     
     if (hash)
@@ -830,7 +830,7 @@ bool Graphics::SetVertexBuffers(const Vector<SharedPtr<VertexBuffer> >& buffers,
         if (!buffers[i])
             continue;
         
-        hash |= buffers[i]->GetHash(i, elementMasks[i]);
+        hash |= buffers[i]->GetBufferHash(i, elementMasks[i]);
     }
     
     if (hash)

Engine/Graphics/Direct3D9/D3D9Graphics.h

@@ -214,8 +214,6 @@ public:
     unsigned GetShadowMapFormat() const { return shadowMapFormat_; }
     /// Return 24-bit shadow map depth texture format, or 0 if not supported.
     unsigned GetHiresShadowMapFormat() const { return hiresShadowMapFormat_; }
-    /// Return whether texture rendertargets are supported. Always true on Direct3D9
-    bool GetRenderTargetSupport() const { return true; }
     /// Return whether Shader Model 3 is supported.
     bool GetSM3Support() const { return hasSM3_; }
     /// Return whether light pre-pass rendering is supported.

Engine/Graphics/Direct3D9/D3D9VertexBuffer.cpp

@@ -289,7 +289,7 @@ void VertexBuffer::UpdateOffsets()
     vertexSize_ = elementOffset;
 }
 
-unsigned long long VertexBuffer::GetHash(unsigned streamIndex, unsigned useMask)
+unsigned long long VertexBuffer::GetBufferHash(unsigned streamIndex, unsigned useMask)
 {
     unsigned long long bufferHash = elementMask_;
     unsigned long long maskHash;

Engine/Graphics/Direct3D9/D3D9VertexBuffer.h

@@ -86,8 +86,8 @@ public:
     const SharedArrayPtr<unsigned char>& GetMorphRangeResetData() { return morphRangeResetData_; }
     /// Return whether has a morph vertex range defined.
     bool HasMorphRange() const { return morphRangeCount_ > 0; }
-    /// Return buffer hash for state sorting.
-    unsigned long long GetHash(unsigned streamIndex, unsigned useMask);
+    /// Return buffer hash for building vertex declarations.
+    unsigned long long GetBufferHash(unsigned streamIndex, unsigned useMask);
     
     /// Return vertex size corresponding to a vertex element mask.
     static unsigned GetVertexSize(unsigned elementMask);

Engine/Graphics/Renderer.h

@@ -1,483 +1,483 @@
-//
-// Urho3D Engine
-// Copyright (c) 2008-2012 Lasse Öörni
-//
-// 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.
-//
-
-#pragma once
-
-#include "Batch.h"
-#include "Color.h"
-#include "Drawable.h"
-#include "HashMap.h"
-#include "HashSet.h"
-#include "Mutex.h"
-#include "Viewport.h"
-
-class DebugRenderer;
-class Geometry;
-class Drawable;
-class Light;
-class Material;
-class Pass;
-class Technique;
-class Octree;
-class Graphics;
-class RenderSurface;
-class ResourceCache;
-class Skeleton;
-class OcclusionBuffer;
-class Texture2D;
-class TextureCube;
-class View;
-class Zone;
-
-static const int SHADOW_MIN_PIXELS = 64;
-static const int NUM_LIGHT_TYPES = 3;
-static const int NUM_SHADOWMAP_RESOLUTIONS = 3;
-static const int INSTANCING_BUFFER_DEFAULT_SIZE = 1024;
-
-/// Light vertex shader variations.
-enum LightVSVariation
-{
-    LVS_DIR = 0,
-    LVS_SPOT,
-    LVS_POINT,
-    LVS_SPEC,
-    LVS_SPOTSPEC,
-    LVS_POINTSPEC,
-    LVS_SHADOW,
-    LVS_SPOTSHADOW,
-    LVS_POINTSHADOW,
-    LVS_DIRSPECSHADOW,
-    LVS_SPOTSPECSHADOW,
-    LVS_POINTSPECSHADOW,
-    MAX_LIGHT_VS_VARIATIONS
-};
-
-/// Per-vertex light vertex shader variations.
-enum VertexLightVSVariation
-{
-    VLVS_NOLIGHTS = 0,
-    VLVS_1LIGHT,
-    VLVS_2LIGHTS,
-    VLVS_3LIGHTS,
-    VLVS_4LIGHTS,
-    VLVS_5LIGHTS,
-    VLVS_6LIGHTS,
-    MAX_VERTEXLIGHT_VS_VARIATIONS
-};
-
-/// Light pixel shader variations.
-enum LightPSVariation
-{
-    LPS_NONE = 0,
-    LPS_SPOT,
-    LPS_POINT,
-    LPS_POINTMASK,
-    LPS_SPEC,
-    LPS_SPOTSPEC,
-    LPS_POINTSPEC,
-    LPS_POINTMASKSPEC,
-    LPS_SHADOW,
-    LPS_SPOTSHADOW,
-    LPS_POINTSHADOW,
-    LPS_POINTMASKSHADOW,
-    LPS_SHADOWSPEC,
-    LPS_SPOTSHADOWSPEC,
-    LPS_POINTSHADOWSPEC,
-    LPS_POINTMASKSHADOWSPEC,
-    MAX_LIGHT_PS_VARIATIONS
-};
-
-/// Deferred light volume vertex shader variations.
-enum DeferredLightVSVariation
-{
-    DLVS_NONE = 0,
-    DLVS_DIR,
-    DLVS_ORTHO,
-    DLVS_ORTHODIR,
-    MAX_DEFERRED_LIGHT_VS_VARIATIONS
-};
-
-/// Deferred light volume pixels shader variations.
-enum DeferredLightPSVariation
-{
-    DLPS_NONE = 0,
-    DLPS_SPOT,
-    DLPS_POINT,
-    DLPS_POINTMASK,
-    DLPS_SPEC,
-    DLPS_SPOTSPEC,
-    DLPS_POINTSPEC,
-    DLPS_POINTMASKSPEC,
-    DLPS_SHADOW,
-    DLPS_SPOTSHADOW,
-    DLPS_POINTSHADOW,
-    DLPS_POINTMASKSHADOW,
-    DLPS_SHADOWSPEC,
-    DLPS_SPOTSHADOWSPEC,
-    DLPS_POINTSHADOWSPEC,
-    DLPS_POINTMASKSHADOWSPEC,
-    DLPS_ORTHO,
-    DLPS_ORTHOSPOT,
-    DLPS_ORTHOPOINT,
-    DLPS_ORTHOPOINTMASK,
-    DLPS_ORTHOSPEC,
-    DLPS_ORTHOSPOTSPEC,
-    DLPS_ORTHOPOINTSPEC,
-    DLPS_ORTHOPOINTMASKSPEC,
-    DLPS_ORTHOSHADOW,
-    DLPS_ORTHOSPOTSHADOW,
-    DLPS_ORTHOPOINTSHADOW,
-    DLPS_ORTHOPOINTMASKSHADOW,
-    DLPS_ORTHOSHADOWSPEC,
-    DLPS_ORTHOSPOTSHADOWSPEC,
-    DLPS_ORTHOPOINTSHADOWSPEC,
-    DLPS_ORTHOPOINTMASKSHADOWSPEC,
-    MAX_DEFERRED_LIGHT_PS_VARIATIONS
-};
-
-/// High-level rendering subsystem. Manages drawing of 3D views.
-class Renderer : public Object
-{
-    OBJECT(Object);
-    
-public:
-    /// Construct.
-    Renderer(Context* context);
-    /// Destruct.
-    virtual ~Renderer();
-    
-    /// %Set number of viewports to render.
-    void SetNumViewports(unsigned num);
-    /// %Set a viewport. Return true if successful.
-    bool SetViewport(unsigned index, Viewport* viewport);
-    /// %Set rendering mode (forward / light pre-pass / deferred.)
-    void SetRenderMode(RenderMode mode);
-    /// %Set specular lighting on/off.
-    void SetSpecularLighting(bool enable);
-    /// %Set texture anisotropy.
-    void SetTextureAnisotropy(int level);
-    /// %Set texture filtering.
-    void SetTextureFilterMode(TextureFilterMode mode);
-    /// %Set texture quality level.
-    void SetTextureQuality(int quality);
-    /// %Set material quality level.
-    void SetMaterialQuality(int quality);
-    /// %Set shadows on/off.
-    void SetDrawShadows(bool enable);
-    /// %Set shadow map resolution.
-    void SetShadowMapSize(int size);
-    /// %Set shadow quality (amount of samples and bit depth.)
-    void SetShadowQuality(int quality);
-    /// %Set reuse of shadow maps. Default is true. If disabled, also transparent geometry can be shadowed.
-    void SetReuseShadowMaps(bool enable);
-    /// %Set maximum number of shadow maps created for one resolution. Only has effect if reuse of shadow maps is disabled.
-    void SetMaxShadowMaps(int shadowMaps);
-    /// %Set maximum number of directional light shadow map cascades. Affects the size of directional light shadow maps.
-    void SetMaxShadowCascades(int cascades);
-    /// %Set dynamic instancing on/off.
-    void SetDynamicInstancing(bool enable);
-    /// %Set maximum number of triangles per object for instancing.
-    void SetMaxInstanceTriangles(int triangles);
-    /// %Set maximum number of occluder trianges.
-    void SetMaxOccluderTriangles(int triangles);
-    /// %Set occluder buffer width.
-    void SetOcclusionBufferSize(int size);
-    /// %Set required screen size (1.0 = full screen) for occluders.
-    void SetOccluderSizeThreshold(float screenSize);
-    /// Return number of viewports.
-    unsigned GetNumViewports() const { return viewports_.Size(); }
-    /// Return viewport.
-    Viewport* GetViewport(unsigned index) const;
-    /// Return rendering mode.
-    RenderMode GetRenderMode() const { return renderMode_; }
-    /// Return whether specular lighting is enabled.
-    bool GetSpecularLighting() const { return specularLighting_; }
-    /// Return whether drawing shadows is enabled.
-    bool GetDrawShadows() const { return drawShadows_; }
-    /// Return texture anisotropy.
-    int GetTextureAnisotropy() const { return textureAnisotropy_; }
-    /// Return texture filtering.
-    TextureFilterMode GetTextureFilterMode() const { return textureFilterMode_; }
-    /// Return texture quality level.
-    int GetTextureQuality() const { return textureQuality_; }
-    /// Return material quality level.
-    int GetMaterialQuality() const { return materialQuality_; }
-    /// Return shadow map resolution.
-    int GetShadowMapSize() const { return shadowMapSize_; }
-    /// Return shadow quality.
-    int GetShadowQuality() const { return shadowQuality_; }
-    /// Return whether shadow maps are reused.
-    bool GetReuseShadowMaps() const { return reuseShadowMaps_; }
-    /// Return maximum number of shadow maps per resolution.
-    int GetMaxShadowMaps() const { return maxShadowMaps_; }
-    /// Return maximum number of directional light shadow map cascades.
-    int GetMaxShadowCascades() const { return maxShadowCascades_; }
-    /// Return whether dynamic instancing is in use.
-    bool GetDynamicInstancing() const { return dynamicInstancing_; }
-    /// Return maximum number of triangles per object for instancing.
-    int GetMaxInstanceTriangles() { return maxInstanceTriangles_; }
-    /// Return maximum number of occluder triangles.
-    int GetMaxOccluderTriangles() const { return maxOccluderTriangles_; }
-    /// Return occlusion buffer width.
-    int GetOcclusionBufferSize() const { return occlusionBufferSize_; }
-    /// Return occluder screen size threshold.
-    float GetOccluderSizeThreshold() const { return occluderSizeThreshold_; }
-    /// Return number of views rendered.
-    unsigned GetNumViews() const { return numViews_; }
-    /// Return number of primitives rendered.
-    unsigned GetNumPrimitives() const { return numPrimitives_; }
-    /// Return number of batches rendered.
-    unsigned GetNumBatches() const { return numBatches_; }
-    /// Return number of geometries rendered.
-    unsigned GetNumGeometries(bool allViews = false) const;
-    /// Return number of lights rendered.
-    unsigned GetNumLights(bool allViews = false) const;
-    /// Return number of shadow maps rendered.
-    unsigned GetNumShadowMaps(bool allViews = false) const;
-    /// Return number of occluders rendered.
-    unsigned GetNumOccluders(bool allViews = false) const;
-    /// Return the default zone.
-    Zone* GetDefaultZone() const { return defaultZone_; }
-    /// Return the default material.
-    Material* GetDefaultMaterial() const { return defaultMaterial_; }
-    /// Return the default range attenuation texture.
-    Texture2D* GetDefaultLightRamp() const { return defaultLightRamp_; }
-    /// Return the default spotlight attenuation texture.
-    Texture2D* GetDefaultLightSpot() const { return defaultLightSpot_; }
-    /// Return the shadowed pointlight face selection cube map.
-    TextureCube* GetFaceSelectCubeMap() const { return faceSelectCubeMap_; }
-    /// Return the shadowed pointlight indirection cube map.
-    TextureCube* GetIndirectionCubeMap() const { return indirectionCubeMap_; }
-    /// Return the instancing vertex buffer
-    VertexBuffer* GetInstancingBuffer() const { return dynamicInstancing_ ? instancingBuffer_ : (VertexBuffer*)0; }
-    /// Return a vertex shader by name.
-    ShaderVariation* GetVertexShader(const String& name, bool checkExists = false) const;
-    /// Return a pixel shader by name.
-    ShaderVariation* GetPixelShader(const String& name, bool checkExists = false) const;
-    /// Return the stencil vertex shader.
-    ShaderVariation* GetStencilVS() const { return stencilVS_; }
-    /// Return the stencil pixel shader.
-    ShaderVariation* GetStencilPS() const { return stencilPS_; }
-    /// Return the frame update parameters.
-    const FrameInfo& GetFrameInfo() { return frame_; }
-    
-    /// Update for rendering. Called by HandleRenderUpdate().
-    void Update(float timeStep);
-    /// Render. Called by Engine.
-    void Render();
-    /// Add debug geometry to the debug renderer.
-    void DrawDebugGeometry(bool depthTest);
-    /// Add a view. Return true if successful.
-    bool AddView(RenderSurface* renderTarget, Viewport* viewport);
-    /// Return volume geometry for a light.
-    Geometry* GetLightGeometry(Light* light);
-    /// Allocate a shadow map. If shadow map reuse is disabled, a different map is returned each time.
-    Texture2D* GetShadowMap(Light* light, Camera* camera, unsigned viewWidth, unsigned viewHeight);
-    /// Allocate a rendertarget or depth-stencil texture for deferred rendering or postprocessing. Should only be called during actual rendering, not before.
-    Texture2D* GetScreenBuffer(int width, int height, unsigned format, bool filtered = false);
-    /// Allocate a depth-stencil surface that does not need to be readable. Should only be called during actual rendering, not before.
-    RenderSurface* GetDepthStencil(int width, int height);
-    /// Allocate an occlusion buffer.
-    OcclusionBuffer* GetOcclusionBuffer(Camera* camera);
-    /// Allocate a temporary shadow camera and a scene node for it. Is thread-safe.
-    Camera* GetShadowCamera();
-    /// Get a shader program.
-    ShaderVariation* GetShader(const String& name, const String& extension, bool checkExists) const;
-    /// Choose shaders for a forward rendering batch.
-    void SetBatchShaders(Batch& batch, Technique* technique, Pass* pass, bool allowShadows = true);
-    /// Choose shaders for a light volume batch.
-    void SetLightVolumeBatchShaders(Batch& batch);
-    /// Set cull mode while taking possible projection flipping into account.
-    void SetCullMode(CullMode mode, Camera* camera);
-    /// Ensure sufficient size of the instancing vertex buffer. Return true if successful.
-    bool ResizeInstancingBuffer(unsigned numInstances);
-    /// Save the screen buffer allocation status. Called by View.
-    void SaveScreenBufferAllocations();
-    /// Restore the screen buffer allocation status. Called by View.
-    void RestoreScreenBufferAllocations();
-    /// Optimize a light by scissor rectangle.
-    void OptimizeLightByScissor(Light* light, Camera* camera);
-    /// Optimize a light by marking it to the stencil buffer and setting a stencil test.
-    void OptimizeLightByStencil(Light* light, Camera* camera);
-    /// Return a scissor rectangle for a light.
-    const Rect& GetLightScissor(Light* light, Camera* camera);
-    
-private:
-    /// Initialize when screen mode initially set.
-    void Initialize();
-    /// Clear views from previous frame.
-    void ResetViews();
-    /// Reload shaders.
-    void LoadShaders();
-    /// Reload shaders for a material technique.
-    void LoadMaterialShaders(Technique* technique);
-    /// Reload shaders for a material pass.
-    void LoadPassShaders(Technique* technique, PassType type, bool allowShadows = true);
-    /// Release shaders used in materials.
-    void ReleaseMaterialShaders();
-    /// Reload textures.
-    void ReloadTextures();
-    /// Create light volume geometries.
-    void CreateGeometries();
-    /// Create instancing vertex buffer.
-    void CreateInstancingBuffer();
-    /// Prepare for rendering of a new view.
-    void PrepareViewRender();
-    /// Remove unused occlusion and screen buffers.
-    void RemoveUnusedBuffers();
-    /// Reset shadow map allocation counts.
-    void ResetShadowMapAllocations();
-    /// Reset screem buffer allocation counts.
-    void ResetScreenBufferAllocations();
-    /// Remove all shadow maps. Called when global shadow map resolution or format is changed.
-    void ResetShadowMaps();
-    /// Remove all occlusion and screen buffers.
-    void ResetBuffers();
-    /// Handle screen mode event.
-    void HandleScreenMode(StringHash eventType, VariantMap& eventData);
-    /// Handle graphics features (re)check event.
-    void HandleGraphicsFeatures(StringHash eventType, VariantMap& eventData);
-    /// Handle render update event.
-    void HandleRenderUpdate(StringHash eventType, VariantMap& eventData);
-    
-    /// Graphics subsystem.
-    WeakPtr<Graphics> graphics_;
-    /// Resource cache subsystem.
-    WeakPtr<ResourceCache> cache_;
-    /// Default zone.
-    SharedPtr<Zone> defaultZone_;
-    /// Directional light quad geometry.
-    SharedPtr<Geometry> dirLightGeometry_;
-    /// Spot light volume geometry.
-    SharedPtr<Geometry> spotLightGeometry_;
-    /// Point light volume geometry.
-    SharedPtr<Geometry> pointLightGeometry_;
-    /// Instance stream vertex buffer.
-    SharedPtr<VertexBuffer> instancingBuffer_;
-    /// Default material.
-    SharedPtr<Material> defaultMaterial_;
-    /// Default range attenuation texture.
-    SharedPtr<Texture2D> defaultLightRamp_;
-    /// Default spotlight attenuation texture.
-    SharedPtr<Texture2D> defaultLightSpot_;
-    /// Face selection cube map for shadowed pointlights.
-    SharedPtr<TextureCube> faceSelectCubeMap_;
-    /// Indirection cube map for shadowed pointlights.
-    SharedPtr<TextureCube> indirectionCubeMap_;
-    /// Stencil rendering vertex shader.
-    SharedPtr<ShaderVariation> stencilVS_;
-    /// Stencil rendering pixel shader.
-    SharedPtr<ShaderVariation> stencilPS_;
-    /// Light vertex shaders.
-    Vector<SharedPtr<ShaderVariation> > lightVS_;
-    /// Light pixel shaders.
-    Vector<SharedPtr<ShaderVariation> > lightPS_;
-    /// Reusable scene nodes with shadow camera components.
-    Vector<SharedPtr<Node> > shadowCameraNodes_;
-    /// Reusable occlusion buffers.
-    Vector<SharedPtr<OcclusionBuffer> > occlusionBuffers_;
-    /// Shadow maps by resolution.
-    HashMap<int, Vector<SharedPtr<Texture2D> > > shadowMaps_;
-    /// Shadow map dummy color buffers by resolution.
-    HashMap<int, SharedPtr<Texture2D> > colorShadowMaps_;
-    /// Shadow map allocations by resolution.
-    HashMap<int, PODVector<Light*> > shadowMapAllocations_;
-    /// Screen buffers by resolution and format.
-    HashMap<long long, Vector<SharedPtr<Texture2D> > > screenBuffers_;
-    /// Current screen buffer allocations by resolution and format.
-    HashMap<long long, unsigned> screenBufferAllocations_;
-    /// Saved status of screen buffer allocations for restoring.
-    HashMap<long long, unsigned> savedScreenBufferAllocations_;
+//
+// Urho3D Engine
+// Copyright (c) 2008-2012 Lasse Öörni
+//
+// 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.
+//
+
+#pragma once
+
+#include "Batch.h"
+#include "Color.h"
+#include "Drawable.h"
+#include "HashMap.h"
+#include "HashSet.h"
+#include "Mutex.h"
+#include "Viewport.h"
+
+class DebugRenderer;
+class Geometry;
+class Drawable;
+class Light;
+class Material;
+class Pass;
+class Technique;
+class Octree;
+class Graphics;
+class RenderSurface;
+class ResourceCache;
+class Skeleton;
+class OcclusionBuffer;
+class Texture2D;
+class TextureCube;
+class View;
+class Zone;
+
+static const int SHADOW_MIN_PIXELS = 64;
+static const int NUM_LIGHT_TYPES = 3;
+static const int NUM_SHADOWMAP_RESOLUTIONS = 3;
+static const int INSTANCING_BUFFER_DEFAULT_SIZE = 1024;
+
+/// Light vertex shader variations.
+enum LightVSVariation
+{
+    LVS_DIR = 0,
+    LVS_SPOT,
+    LVS_POINT,
+    LVS_SPEC,
+    LVS_SPOTSPEC,
+    LVS_POINTSPEC,
+    LVS_SHADOW,
+    LVS_SPOTSHADOW,
+    LVS_POINTSHADOW,
+    LVS_DIRSPECSHADOW,
+    LVS_SPOTSPECSHADOW,
+    LVS_POINTSPECSHADOW,
+    MAX_LIGHT_VS_VARIATIONS
+};
+
+/// Per-vertex light vertex shader variations.
+enum VertexLightVSVariation
+{
+    VLVS_NOLIGHTS = 0,
+    VLVS_1LIGHT,
+    VLVS_2LIGHTS,
+    VLVS_3LIGHTS,
+    VLVS_4LIGHTS,
+    VLVS_5LIGHTS,
+    VLVS_6LIGHTS,
+    MAX_VERTEXLIGHT_VS_VARIATIONS
+};
+
+/// Light pixel shader variations.
+enum LightPSVariation
+{
+    LPS_NONE = 0,
+    LPS_SPOT,
+    LPS_POINT,
+    LPS_POINTMASK,
+    LPS_SPEC,
+    LPS_SPOTSPEC,
+    LPS_POINTSPEC,
+    LPS_POINTMASKSPEC,
+    LPS_SHADOW,
+    LPS_SPOTSHADOW,
+    LPS_POINTSHADOW,
+    LPS_POINTMASKSHADOW,
+    LPS_SHADOWSPEC,
+    LPS_SPOTSHADOWSPEC,
+    LPS_POINTSHADOWSPEC,
+    LPS_POINTMASKSHADOWSPEC,
+    MAX_LIGHT_PS_VARIATIONS
+};
+
+/// Deferred light volume vertex shader variations.
+enum DeferredLightVSVariation
+{
+    DLVS_NONE = 0,
+    DLVS_DIR,
+    DLVS_ORTHO,
+    DLVS_ORTHODIR,
+    MAX_DEFERRED_LIGHT_VS_VARIATIONS
+};
+
+/// Deferred light volume pixels shader variations.
+enum DeferredLightPSVariation
+{
+    DLPS_NONE = 0,
+    DLPS_SPOT,
+    DLPS_POINT,
+    DLPS_POINTMASK,
+    DLPS_SPEC,
+    DLPS_SPOTSPEC,
+    DLPS_POINTSPEC,
+    DLPS_POINTMASKSPEC,
+    DLPS_SHADOW,
+    DLPS_SPOTSHADOW,
+    DLPS_POINTSHADOW,
+    DLPS_POINTMASKSHADOW,
+    DLPS_SHADOWSPEC,
+    DLPS_SPOTSHADOWSPEC,
+    DLPS_POINTSHADOWSPEC,
+    DLPS_POINTMASKSHADOWSPEC,
+    DLPS_ORTHO,
+    DLPS_ORTHOSPOT,
+    DLPS_ORTHOPOINT,
+    DLPS_ORTHOPOINTMASK,
+    DLPS_ORTHOSPEC,
+    DLPS_ORTHOSPOTSPEC,
+    DLPS_ORTHOPOINTSPEC,
+    DLPS_ORTHOPOINTMASKSPEC,
+    DLPS_ORTHOSHADOW,
+    DLPS_ORTHOSPOTSHADOW,
+    DLPS_ORTHOPOINTSHADOW,
+    DLPS_ORTHOPOINTMASKSHADOW,
+    DLPS_ORTHOSHADOWSPEC,
+    DLPS_ORTHOSPOTSHADOWSPEC,
+    DLPS_ORTHOPOINTSHADOWSPEC,
+    DLPS_ORTHOPOINTMASKSHADOWSPEC,
+    MAX_DEFERRED_LIGHT_PS_VARIATIONS
+};
+
+/// High-level rendering subsystem. Manages drawing of 3D views.
+class Renderer : public Object
+{
+    OBJECT(Object);
+    
+public:
+    /// Construct.
+    Renderer(Context* context);
+    /// Destruct.
+    virtual ~Renderer();
+    
+    /// %Set number of viewports to render.
+    void SetNumViewports(unsigned num);
+    /// %Set a viewport. Return true if successful.
+    bool SetViewport(unsigned index, Viewport* viewport);
+    /// %Set rendering mode (forward / light pre-pass / deferred.)
+    void SetRenderMode(RenderMode mode);
+    /// %Set specular lighting on/off.
+    void SetSpecularLighting(bool enable);
+    /// %Set texture anisotropy.
+    void SetTextureAnisotropy(int level);
+    /// %Set texture filtering.
+    void SetTextureFilterMode(TextureFilterMode mode);
+    /// %Set texture quality level.
+    void SetTextureQuality(int quality);
+    /// %Set material quality level.
+    void SetMaterialQuality(int quality);
+    /// %Set shadows on/off.
+    void SetDrawShadows(bool enable);
+    /// %Set shadow map resolution.
+    void SetShadowMapSize(int size);
+    /// %Set shadow quality (amount of samples and bit depth.)
+    void SetShadowQuality(int quality);
+    /// %Set reuse of shadow maps. Default is true. If disabled, also transparent geometry can be shadowed.
+    void SetReuseShadowMaps(bool enable);
+    /// %Set maximum number of shadow maps created for one resolution. Only has effect if reuse of shadow maps is disabled.
+    void SetMaxShadowMaps(int shadowMaps);
+    /// %Set maximum number of directional light shadow map cascades. Affects the size of directional light shadow maps.
+    void SetMaxShadowCascades(int cascades);
+    /// %Set dynamic instancing on/off.
+    void SetDynamicInstancing(bool enable);
+    /// %Set maximum number of triangles per object for instancing.
+    void SetMaxInstanceTriangles(int triangles);
+    /// %Set maximum number of occluder trianges.
+    void SetMaxOccluderTriangles(int triangles);
+    /// %Set occluder buffer width.
+    void SetOcclusionBufferSize(int size);
+    /// %Set required screen size (1.0 = full screen) for occluders.
+    void SetOccluderSizeThreshold(float screenSize);
+    /// Return number of viewports.
+    unsigned GetNumViewports() const { return viewports_.Size(); }
+    /// Return viewport.
+    Viewport* GetViewport(unsigned index) const;
+    /// Return rendering mode.
+    RenderMode GetRenderMode() const { return renderMode_; }
+    /// Return whether specular lighting is enabled.
+    bool GetSpecularLighting() const { return specularLighting_; }
+    /// Return whether drawing shadows is enabled.
+    bool GetDrawShadows() const { return drawShadows_; }
+    /// Return texture anisotropy.
+    int GetTextureAnisotropy() const { return textureAnisotropy_; }
+    /// Return texture filtering.
+    TextureFilterMode GetTextureFilterMode() const { return textureFilterMode_; }
+    /// Return texture quality level.
+    int GetTextureQuality() const { return textureQuality_; }
+    /// Return material quality level.
+    int GetMaterialQuality() const { return materialQuality_; }
+    /// Return shadow map resolution.
+    int GetShadowMapSize() const { return shadowMapSize_; }
+    /// Return shadow quality.
+    int GetShadowQuality() const { return shadowQuality_; }
+    /// Return whether shadow maps are reused.
+    bool GetReuseShadowMaps() const { return reuseShadowMaps_; }
+    /// Return maximum number of shadow maps per resolution.
+    int GetMaxShadowMaps() const { return maxShadowMaps_; }
+    /// Return maximum number of directional light shadow map cascades.
+    int GetMaxShadowCascades() const { return maxShadowCascades_; }
+    /// Return whether dynamic instancing is in use.
+    bool GetDynamicInstancing() const { return dynamicInstancing_; }
+    /// Return maximum number of triangles per object for instancing.
+    int GetMaxInstanceTriangles() { return maxInstanceTriangles_; }
+    /// Return maximum number of occluder triangles.
+    int GetMaxOccluderTriangles() const { return maxOccluderTriangles_; }
+    /// Return occlusion buffer width.
+    int GetOcclusionBufferSize() const { return occlusionBufferSize_; }
+    /// Return occluder screen size threshold.
+    float GetOccluderSizeThreshold() const { return occluderSizeThreshold_; }
+    /// Return number of views rendered.
+    unsigned GetNumViews() const { return numViews_; }
+    /// Return number of primitives rendered.
+    unsigned GetNumPrimitives() const { return numPrimitives_; }
+    /// Return number of batches rendered.
+    unsigned GetNumBatches() const { return numBatches_; }
+    /// Return number of geometries rendered.
+    unsigned GetNumGeometries(bool allViews = false) const;
+    /// Return number of lights rendered.
+    unsigned GetNumLights(bool allViews = false) const;
+    /// Return number of shadow maps rendered.
+    unsigned GetNumShadowMaps(bool allViews = false) const;
+    /// Return number of occluders rendered.
+    unsigned GetNumOccluders(bool allViews = false) const;
+    /// Return the default zone.
+    Zone* GetDefaultZone() const { return defaultZone_; }
+    /// Return the default material.
+    Material* GetDefaultMaterial() const { return defaultMaterial_; }
+    /// Return the default range attenuation texture.
+    Texture2D* GetDefaultLightRamp() const { return defaultLightRamp_; }
+    /// Return the default spotlight attenuation texture.
+    Texture2D* GetDefaultLightSpot() const { return defaultLightSpot_; }
+    /// Return the shadowed pointlight face selection cube map.
+    TextureCube* GetFaceSelectCubeMap() const { return faceSelectCubeMap_; }
+    /// Return the shadowed pointlight indirection cube map.
+    TextureCube* GetIndirectionCubeMap() const { return indirectionCubeMap_; }
+    /// Return the instancing vertex buffer
+    VertexBuffer* GetInstancingBuffer() const { return dynamicInstancing_ ? instancingBuffer_ : (VertexBuffer*)0; }
+    /// Return a vertex shader by name.
+    ShaderVariation* GetVertexShader(const String& name, bool checkExists = false) const;
+    /// Return a pixel shader by name.
+    ShaderVariation* GetPixelShader(const String& name, bool checkExists = false) const;
+    /// Return the stencil vertex shader.
+    ShaderVariation* GetStencilVS() const { return stencilVS_; }
+    /// Return the stencil pixel shader.
+    ShaderVariation* GetStencilPS() const { return stencilPS_; }
+    /// Return the frame update parameters.
+    const FrameInfo& GetFrameInfo() { return frame_; }
+    
+    /// Update for rendering. Called by HandleRenderUpdate().
+    void Update(float timeStep);
+    /// Render. Called by Engine.
+    void Render();
+    /// Add debug geometry to the debug renderer.
+    void DrawDebugGeometry(bool depthTest);
+    /// Add a view. Return true if successful.
+    bool AddView(RenderSurface* renderTarget, Viewport* viewport);
+    /// Return volume geometry for a light.
+    Geometry* GetLightGeometry(Light* light);
+    /// Allocate a shadow map. If shadow map reuse is disabled, a different map is returned each time.
+    Texture2D* GetShadowMap(Light* light, Camera* camera, unsigned viewWidth, unsigned viewHeight);
+    /// Allocate a rendertarget or depth-stencil texture for deferred rendering or postprocessing. Should only be called during actual rendering, not before.
+    Texture2D* GetScreenBuffer(int width, int height, unsigned format, bool filtered = false);
+    /// Allocate a depth-stencil surface that does not need to be readable. Should only be called during actual rendering, not before.
+    RenderSurface* GetDepthStencil(int width, int height);
+    /// Allocate an occlusion buffer.
+    OcclusionBuffer* GetOcclusionBuffer(Camera* camera);
+    /// Allocate a temporary shadow camera and a scene node for it. Is thread-safe.
+    Camera* GetShadowCamera();
+    /// Get a shader program.
+    ShaderVariation* GetShader(const String& name, const String& extension, bool checkExists) const;
+    /// Choose shaders for a forward rendering batch.
+    void SetBatchShaders(Batch& batch, Technique* technique, Pass* pass, bool allowShadows = true);
+    /// Choose shaders for a light volume batch.
+    void SetLightVolumeBatchShaders(Batch& batch);
+    /// Set cull mode while taking possible projection flipping into account.
+    void SetCullMode(CullMode mode, Camera* camera);
+    /// Ensure sufficient size of the instancing vertex buffer. Return true if successful.
+    bool ResizeInstancingBuffer(unsigned numInstances);
+    /// Save the screen buffer allocation status. Called by View.
+    void SaveScreenBufferAllocations();
+    /// Restore the screen buffer allocation status. Called by View.
+    void RestoreScreenBufferAllocations();
+    /// Optimize a light by scissor rectangle.
+    void OptimizeLightByScissor(Light* light, Camera* camera);
+    /// Optimize a light by marking it to the stencil buffer and setting a stencil test.
+    void OptimizeLightByStencil(Light* light, Camera* camera);
+    /// Return a scissor rectangle for a light.
+    const Rect& GetLightScissor(Light* light, Camera* camera);
+    
+private:
+    /// Initialize when screen mode initially set.
+    void Initialize();
+    /// Clear views from previous frame.
+    void ResetViews();
+    /// Reload shaders.
+    void LoadShaders();
+    /// Reload shaders for a material technique.
+    void LoadMaterialShaders(Technique* technique);
+    /// Reload shaders for a material pass.
+    void LoadPassShaders(Technique* technique, PassType type, bool allowShadows = true);
+    /// Release shaders used in materials.
+    void ReleaseMaterialShaders();
+    /// Reload textures.
+    void ReloadTextures();
+    /// Create light volume geometries.
+    void CreateGeometries();
+    /// Create instancing vertex buffer.
+    void CreateInstancingBuffer();
+    /// Prepare for rendering of a new view.
+    void PrepareViewRender();
+    /// Remove unused occlusion and screen buffers.
+    void RemoveUnusedBuffers();
+    /// Reset shadow map allocation counts.
+    void ResetShadowMapAllocations();
+    /// Reset screem buffer allocation counts.
+    void ResetScreenBufferAllocations();
+    /// Remove all shadow maps. Called when global shadow map resolution or format is changed.
+    void ResetShadowMaps();
+    /// Remove all occlusion and screen buffers.
+    void ResetBuffers();
+    /// Handle screen mode event.
+    void HandleScreenMode(StringHash eventType, VariantMap& eventData);
+    /// Handle graphics features (re)check event.
+    void HandleGraphicsFeatures(StringHash eventType, VariantMap& eventData);
+    /// Handle render update event.
+    void HandleRenderUpdate(StringHash eventType, VariantMap& eventData);
+    
+    /// Graphics subsystem.
+    WeakPtr<Graphics> graphics_;
+    /// Resource cache subsystem.
+    WeakPtr<ResourceCache> cache_;
+    /// Default zone.
+    SharedPtr<Zone> defaultZone_;
+    /// Directional light quad geometry.
+    SharedPtr<Geometry> dirLightGeometry_;
+    /// Spot light volume geometry.
+    SharedPtr<Geometry> spotLightGeometry_;
+    /// Point light volume geometry.
+    SharedPtr<Geometry> pointLightGeometry_;
+    /// Instance stream vertex buffer.
+    SharedPtr<VertexBuffer> instancingBuffer_;
+    /// Default material.
+    SharedPtr<Material> defaultMaterial_;
+    /// Default range attenuation texture.
+    SharedPtr<Texture2D> defaultLightRamp_;
+    /// Default spotlight attenuation texture.
+    SharedPtr<Texture2D> defaultLightSpot_;
+    /// Face selection cube map for shadowed pointlights.
+    SharedPtr<TextureCube> faceSelectCubeMap_;
+    /// Indirection cube map for shadowed pointlights.
+    SharedPtr<TextureCube> indirectionCubeMap_;
+    /// Stencil rendering vertex shader.
+    SharedPtr<ShaderVariation> stencilVS_;
+    /// Stencil rendering pixel shader.
+    SharedPtr<ShaderVariation> stencilPS_;
+    /// Light vertex shaders.
+    Vector<SharedPtr<ShaderVariation> > lightVS_;
+    /// Light pixel shaders.
+    Vector<SharedPtr<ShaderVariation> > lightPS_;
+    /// Reusable scene nodes with shadow camera components.
+    Vector<SharedPtr<Node> > shadowCameraNodes_;
+    /// Reusable occlusion buffers.
+    Vector<SharedPtr<OcclusionBuffer> > occlusionBuffers_;
+    /// Shadow maps by resolution.
+    HashMap<int, Vector<SharedPtr<Texture2D> > > shadowMaps_;
+    /// Shadow map dummy color buffers by resolution.
+    HashMap<int, SharedPtr<Texture2D> > colorShadowMaps_;
+    /// Shadow map allocations by resolution.
+    HashMap<int, PODVector<Light*> > shadowMapAllocations_;
+    /// Screen buffers by resolution and format.
+    HashMap<long long, Vector<SharedPtr<Texture2D> > > screenBuffers_;
+    /// Current screen buffer allocations by resolution and format.
+    HashMap<long long, unsigned> screenBufferAllocations_;
+    /// Saved status of screen buffer allocations for restoring.
+    HashMap<long long, unsigned> savedScreenBufferAllocations_;
     /// Cache for light scissor queries.
-    HashMap<Pair<Light*, Camera*>, Rect> lightScissorCache_;
-    /// Viewports.
-    Vector<SharedPtr<Viewport> > viewports_;
-    /// Views.
-    Vector<SharedPtr<View> > views_;
-    /// Octrees that have been updated during the frame.
-    HashSet<Octree*> updatedOctrees_;
-    /// Techniques for which missing shader error has been displayed.
-    HashSet<Technique*> shaderErrorDisplayed_;
-    /// Mutex for shadow camera allocation.
-    Mutex rendererMutex_;
-    /// Vertex shader format.
-    String vsFormat_;
-    /// Pixel shader format.
-    String psFormat_;
-    /// Base directory for shaders.
-    String shaderPath_;
-    /// Frame info for rendering.
-    FrameInfo frame_;
-    /// Rendering mode.
-    RenderMode renderMode_;
-    /// Texture anisotropy level.
-    int textureAnisotropy_;
-    /// Texture filtering mode.
-    TextureFilterMode textureFilterMode_;
-    /// Texture quality level.
-    int textureQuality_;
-    /// Material quality level.
-    int materialQuality_;
-    /// Shadow map resolution.
-    int shadowMapSize_;
-    /// Shadow quality.
-    int shadowQuality_;
-    /// Maximum number of shadow maps per resolution.
-    int maxShadowMaps_;
-    /// Maximum number of directional light shadow cascades.
-    int maxShadowCascades_;
-    /// Maximum triangles per object for instancing.
-    int maxInstanceTriangles_;
-    /// Maximum occluder triangles.
-    int maxOccluderTriangles_;
-    /// Occlusion buffer width.
-    int occlusionBufferSize_;
-    /// Occluder screen size threshold.
-    float occluderSizeThreshold_;
-    /// Number of views.
-    unsigned numViews_;
-    /// Number of occlusion buffers in use.
-    unsigned numOcclusionBuffers_;
-    /// Number of temporary shadow cameras in use.
-    unsigned numShadowCameras_;
-    /// Number of primitives (3D geometry only.)
-    unsigned numPrimitives_;
-    /// Number of batches (3D geometry only.)
-    unsigned numBatches_;
-    /// Frame number on which shaders last changed.
-    unsigned shadersChangedFrameNumber_;
+    HashMap<Pair<Light*, Camera*>, Rect> lightScissorCache_;
+    /// Viewports.
+    Vector<SharedPtr<Viewport> > viewports_;
+    /// Views.
+    Vector<SharedPtr<View> > views_;
+    /// Octrees that have been updated during the frame.
+    HashSet<Octree*> updatedOctrees_;
+    /// Techniques for which missing shader error has been displayed.
+    HashSet<Technique*> shaderErrorDisplayed_;
+    /// Mutex for shadow camera allocation.
+    Mutex rendererMutex_;
+    /// Vertex shader format.
+    String vsFormat_;
+    /// Pixel shader format.
+    String psFormat_;
+    /// Base directory for shaders.
+    String shaderPath_;
+    /// Frame info for rendering.
+    FrameInfo frame_;
+    /// Rendering mode.
+    RenderMode renderMode_;
+    /// Texture anisotropy level.
+    int textureAnisotropy_;
+    /// Texture filtering mode.
+    TextureFilterMode textureFilterMode_;
+    /// Texture quality level.
+    int textureQuality_;
+    /// Material quality level.
+    int materialQuality_;
+    /// Shadow map resolution.
+    int shadowMapSize_;
+    /// Shadow quality.
+    int shadowQuality_;
+    /// Maximum number of shadow maps per resolution.
+    int maxShadowMaps_;
+    /// Maximum number of directional light shadow cascades.
+    int maxShadowCascades_;
+    /// Maximum triangles per object for instancing.
+    int maxInstanceTriangles_;
+    /// Maximum occluder triangles.
+    int maxOccluderTriangles_;
+    /// Occlusion buffer width.
+    int occlusionBufferSize_;
+    /// Occluder screen size threshold.
+    float occluderSizeThreshold_;
+    /// Number of views.
+    unsigned numViews_;
+    /// Number of occlusion buffers in use.
+    unsigned numOcclusionBuffers_;
+    /// Number of temporary shadow cameras in use.
+    unsigned numShadowCameras_;
+    /// Number of primitives (3D geometry only.)
+    unsigned numPrimitives_;
+    /// Number of batches (3D geometry only.)
+    unsigned numBatches_;
+    /// Frame number on which shaders last changed.
+    unsigned shadersChangedFrameNumber_;
     /// Current stencil value for light optimization.
-    unsigned char lightStencilValue_;
-    /// Specular lighting flag.
-    bool specularLighting_;
-    /// Draw shadows flag.
-    bool drawShadows_;
-    /// Shadow map reuse flag.
-    bool reuseShadowMaps_;
-    /// Dynamic instancing flag.
-    bool dynamicInstancing_;
-    /// Shaders need reloading flag.
-    bool shadersDirty_;
-    /// Initialized flag.
-    bool initialized_;
-};
+    unsigned char lightStencilValue_;
+    /// Specular lighting flag.
+    bool specularLighting_;
+    /// Draw shadows flag.
+    bool drawShadows_;
+    /// Shadow map reuse flag.
+    bool reuseShadowMaps_;
+    /// Dynamic instancing flag.
+    bool dynamicInstancing_;
+    /// Shaders need reloading flag.
+    bool shadersDirty_;
+    /// Initialized flag.
+    bool initialized_;
+};

Engine/IO/Deserializer.cpp

@@ -230,16 +230,12 @@ String Deserializer::ReadFileID()
 
 StringHash Deserializer::ReadStringHash()
 {
-    StringHash ret;
-    Read((void*)ret.GetData(), sizeof(unsigned));
-    return ret;
+    return StringHash(ReadUInt());
 }
 
 ShortStringHash Deserializer::ReadShortStringHash()
 {
-    ShortStringHash ret;
-    Read((void*)ret.GetData(), sizeof(unsigned short));
-    return ret;
+    return ShortStringHash(ReadUShort());
 }
 
 PODVector<unsigned char> Deserializer::ReadBuffer()