resolve returns actual type

hw3d/BindableCodex.h

@@ -12,14 +12,14 @@ namespace Bind
 	{
 	public:
 		template<class T,typename...Params>
-		static std::shared_ptr<Bindable> Resolve( Graphics& gfx,Params&&...p ) noxnd
+		static std::shared_ptr<T> Resolve( Graphics& gfx,Params&&...p ) noxnd
 		{
 			static_assert( std::is_base_of<Bindable,T>::value,"Can only resolve classes derived from Bindable" );
 			return Get().Resolve_<T>( gfx,std::forward<Params>( p )... );
 		}
 	private:
 		template<class T,typename...Params>
-		std::shared_ptr<Bindable> Resolve_( Graphics& gfx,Params&&...p ) noxnd
+		std::shared_ptr<T> Resolve_( Graphics& gfx,Params&&...p ) noxnd
 		{
 			const auto key = T::GenerateUID( std::forward<Params>( p )... );
 			const auto i = binds.find( key );
@@ -31,7 +31,7 @@ namespace Bind
 			}
 			else
 			{
-				return i->second;
+				return std::static_pointer_cast<T>( i->second );
 			}
 		}
 		static Codex& Get()

hw3d/ConstantBuffers.h

@@ -72,11 +72,11 @@ namespace Bind
 		{
 			GetContext( gfx )->VSSetConstantBuffers( slot,1u,pConstantBuffer.GetAddressOf() );
 		}
-		static std::shared_ptr<Bindable> Resolve( Graphics& gfx,const C& consts,UINT slot = 0 )
+		static std::shared_ptr<VertexConstantBuffer> Resolve( Graphics& gfx,const C& consts,UINT slot = 0 )
 		{
 			return Codex::Resolve<VertexConstantBuffer>( gfx,consts,slot );
 		}
-		static std::shared_ptr<Bindable> Resolve( Graphics& gfx,UINT slot = 0 )
+		static std::shared_ptr<VertexConstantBuffer> Resolve( Graphics& gfx,UINT slot = 0 )
 		{
 			return Codex::Resolve<VertexConstantBuffer>( gfx,slot );
 		}
@@ -107,11 +107,11 @@ namespace Bind
 		{
 			GetContext( gfx )->PSSetConstantBuffers( slot,1u,pConstantBuffer.GetAddressOf() );
 		}
-		static std::shared_ptr<Bindable> Resolve( Graphics& gfx,const C& consts,UINT slot = 0 )
+		static std::shared_ptr<PixelConstantBuffer> Resolve( Graphics& gfx,const C& consts,UINT slot = 0 )
 		{
 			return Codex::Resolve<PixelConstantBuffer>( gfx,consts,slot );
 		}
-		static std::shared_ptr<Bindable> Resolve( Graphics& gfx,UINT slot = 0 )
+		static std::shared_ptr<PixelConstantBuffer> Resolve( Graphics& gfx,UINT slot = 0 )
 		{
 			return Codex::Resolve<PixelConstantBuffer>( gfx,slot );
 		}

hw3d/IndexBuffer.cpp

@@ -36,7 +36,7 @@ namespace Bind
 	{
 		return count;
 	}
-	std::shared_ptr<Bindable> IndexBuffer::Resolve( Graphics& gfx,const std::string& tag,
+	std::shared_ptr<IndexBuffer> IndexBuffer::Resolve( Graphics& gfx,const std::string& tag,
 			const std::vector<unsigned short>& indices )
 	{
 		return Codex::Resolve<IndexBuffer>( gfx,tag,indices );

hw3d/IndexBuffer.h

@@ -10,7 +10,7 @@ namespace Bind
 		IndexBuffer( Graphics& gfx,std::string tag,const std::vector<unsigned short>& indices );
 		void Bind( Graphics& gfx ) noexcept override;
 		UINT GetCount() const noexcept;
-		static std::shared_ptr<Bindable> Resolve( Graphics& gfx,const std::string& tag,
+		static std::shared_ptr<IndexBuffer> Resolve( Graphics& gfx,const std::string& tag,
 			const std::vector<unsigned short>& indices );
 		template<typename...Ignore>
 		static std::string GenerateUID( const std::string& tag,Ignore&&...ignore )

hw3d/InputLayout.cpp

@@ -27,7 +27,7 @@ namespace Bind
 	{
 		GetContext( gfx )->IASetInputLayout( pInputLayout.Get() );
 	}
-	std::shared_ptr<Bindable> InputLayout::Resolve( Graphics& gfx,
+	std::shared_ptr<InputLayout> InputLayout::Resolve( Graphics& gfx,
 			const Dvtx::VertexLayout& layout,ID3DBlob* pVertexShaderBytecode )
 	{
 		return Codex::Resolve<InputLayout>( gfx,layout,pVertexShaderBytecode );

hw3d/InputLayout.h

@@ -11,7 +11,7 @@ namespace Bind
 			Dvtx::VertexLayout layout,
 			ID3DBlob* pVertexShaderBytecode );
 		void Bind( Graphics& gfx ) noexcept override;
-		static std::shared_ptr<Bindable> Resolve( Graphics& gfx,
+		static std::shared_ptr<InputLayout> Resolve( Graphics& gfx,
 			const Dvtx::VertexLayout& layout,ID3DBlob* pVertexShaderBytecode );
 		static std::string GenerateUID( const Dvtx::VertexLayout& layout,ID3DBlob* pVertexShaderBytecode = nullptr );
 		std::string GetUID() const noexcept override;

hw3d/Mesh.cpp

@@ -294,7 +294,7 @@ std::unique_ptr<Mesh> Model::ParseMesh( Graphics& gfx,const aiMesh& mesh,const a
 	bindablePtrs.push_back( IndexBuffer::Resolve( gfx,meshTag,indices ) );
 
 	auto pvs = VertexShader::Resolve( gfx,"PhongVS.cso" );
-	auto pvsbc = static_cast<VertexShader&>(*pvs).GetBytecode();
+	auto pvsbc = pvs->GetBytecode();
 	bindablePtrs.push_back( std::move( pvs ) );
 
 	bindablePtrs.push_back( InputLayout::Resolve( gfx,vbuf.GetLayout(),pvsbc ) );

hw3d/PixelShader.cpp

@@ -19,7 +19,7 @@ namespace Bind
 	{
 		GetContext( gfx )->PSSetShader( pPixelShader.Get(),nullptr,0u );
 	}
-	std::shared_ptr<Bindable> PixelShader::Resolve( Graphics& gfx,const std::string& path )
+	std::shared_ptr<PixelShader> PixelShader::Resolve( Graphics& gfx,const std::string& path )
 	{
 		return Codex::Resolve<PixelShader>( gfx,path );
 	}

hw3d/PixelShader.h

@@ -8,7 +8,7 @@ namespace Bind
 	public:
 		PixelShader( Graphics& gfx,const std::string& path );
 		void Bind( Graphics& gfx ) noexcept override;
-		static std::shared_ptr<Bindable> Resolve( Graphics& gfx,const std::string& path );
+		static std::shared_ptr<PixelShader> Resolve( Graphics& gfx,const std::string& path );
 		static std::string GenerateUID( const std::string& path );
 		std::string GetUID() const noexcept override;
 	protected:

hw3d/Sampler.cpp

@@ -21,7 +21,7 @@ namespace Bind
 	{
 		GetContext( gfx )->PSSetSamplers( 0,1,pSampler.GetAddressOf() );
 	}
-	std::shared_ptr<Bindable> Sampler::Resolve( Graphics& gfx )
+	std::shared_ptr<Sampler> Sampler::Resolve( Graphics& gfx )
 	{
 		return Codex::Resolve<Sampler>( gfx );
 	}

hw3d/Sampler.h

@@ -8,7 +8,7 @@ namespace Bind
 	public:
 		Sampler( Graphics& gfx );
 		void Bind( Graphics& gfx ) noexcept override;
-		static std::shared_ptr<Bindable> Resolve( Graphics& gfx );
+		static std::shared_ptr<Sampler> Resolve( Graphics& gfx );
 		static std::string GenerateUID();
 		std::string GetUID() const noexcept override;
 	protected:

hw3d/SolidSphere.cpp

@@ -17,7 +17,7 @@ SolidSphere::SolidSphere( Graphics& gfx,float radius )
 	AddBind( IndexBuffer::Resolve( gfx,geometryTag,model.indices ) );
 
 	auto pvs = VertexShader::Resolve( gfx,"SolidVS.cso" );
-	auto pvsbc = static_cast<VertexShader&>(*pvs).GetBytecode();
+	auto pvsbc = pvs->GetBytecode();
 	AddBind( std::move( pvs ) );
 
 	AddBind( PixelShader::Resolve( gfx,"SolidPS.cso" ) );

hw3d/Texture.cpp

@@ -53,7 +53,7 @@ namespace Bind
 	{
 		GetContext( gfx )->PSSetShaderResources( slot,1u,pTextureView.GetAddressOf() );
 	}
-	std::shared_ptr<Bindable> Texture::Resolve( Graphics& gfx,const std::string& path,UINT slot )
+	std::shared_ptr<Texture> Texture::Resolve( Graphics& gfx,const std::string& path,UINT slot )
 	{
 		return Codex::Resolve<Texture>( gfx,path,slot );
 	}

hw3d/Texture.h

@@ -10,7 +10,7 @@ namespace Bind
 	public:
 		Texture( Graphics& gfx,const std::string& path,UINT slot = 0 );
 		void Bind( Graphics& gfx ) noexcept override;
-		static std::shared_ptr<Bindable> Resolve( Graphics& gfx,const std::string& path,UINT slot = 0 );
+		static std::shared_ptr<Texture> Resolve( Graphics& gfx,const std::string& path,UINT slot = 0 );
 		static std::string GenerateUID( const std::string& path,UINT slot = 0 );
 		std::string GetUID() const noexcept override;
 	private:

hw3d/Topology.cpp

@@ -12,7 +12,7 @@ namespace Bind
 	{
 		GetContext( gfx )->IASetPrimitiveTopology( type );
 	}
-	std::shared_ptr<Bindable> Topology::Resolve( Graphics& gfx,D3D11_PRIMITIVE_TOPOLOGY type )
+	std::shared_ptr<Topology> Topology::Resolve( Graphics& gfx,D3D11_PRIMITIVE_TOPOLOGY type )
 	{
 		return Codex::Resolve<Topology>( gfx,type );
 	}

hw3d/Topology.h

@@ -8,7 +8,7 @@ namespace Bind
 	public:
 		Topology( Graphics& gfx,D3D11_PRIMITIVE_TOPOLOGY type );
 		void Bind( Graphics& gfx ) noexcept override;
-		static std::shared_ptr<Bindable> Resolve( Graphics& gfx,D3D11_PRIMITIVE_TOPOLOGY type );
+		static std::shared_ptr<Topology> Resolve( Graphics& gfx,D3D11_PRIMITIVE_TOPOLOGY type );
 		static std::string GenerateUID( D3D11_PRIMITIVE_TOPOLOGY type );
 		std::string GetUID() const noexcept override;
 	protected:

hw3d/VertexBuffer.cpp

@@ -31,7 +31,7 @@ namespace Bind
 		const UINT offset = 0u;
 		GetContext( gfx )->IASetVertexBuffers( 0u,1u,pVertexBuffer.GetAddressOf(),&stride,&offset );
 	}
-	std::shared_ptr<Bindable> VertexBuffer::Resolve( Graphics& gfx,const std::string& tag,
+	std::shared_ptr<VertexBuffer> VertexBuffer::Resolve( Graphics& gfx,const std::string& tag,
 		const Dvtx::VertexBuffer& vbuf )
 	{
 		return Codex::Resolve<VertexBuffer>( gfx,tag,vbuf );

hw3d/VertexBuffer.h

@@ -11,7 +11,7 @@ namespace Bind
 		VertexBuffer( Graphics& gfx,const std::string& tag,const Dvtx::VertexBuffer& vbuf );
 		VertexBuffer( Graphics& gfx,const Dvtx::VertexBuffer& vbuf );
 		void Bind( Graphics& gfx ) noexcept override;
-		static std::shared_ptr<Bindable> Resolve( Graphics& gfx,const std::string& tag,
+		static std::shared_ptr<VertexBuffer> Resolve( Graphics& gfx,const std::string& tag,
 			const Dvtx::VertexBuffer& vbuf );
 		template<typename...Ignore>
 		static std::string GenerateUID( const std::string& tag,Ignore&&...ignore )

hw3d/VertexShader.cpp

@@ -29,7 +29,7 @@ namespace Bind
 	{
 		return pBytecodeBlob.Get();
 	}
-	std::shared_ptr<Bindable> VertexShader::Resolve( Graphics& gfx,const std::string& path )
+	std::shared_ptr<VertexShader> VertexShader::Resolve( Graphics& gfx,const std::string& path )
 	{
 		return Codex::Resolve<VertexShader>( gfx,path );
 	}

hw3d/VertexShader.h

@@ -9,7 +9,7 @@ namespace Bind
 		VertexShader( Graphics& gfx,const std::string& path );
 		void Bind( Graphics& gfx ) noexcept override;
 		ID3DBlob* GetBytecode() const noexcept;
-		static std::shared_ptr<Bindable> Resolve( Graphics& gfx,const std::string& path );
+		static std::shared_ptr<VertexShader> Resolve( Graphics& gfx,const std::string& path );
 		static std::string GenerateUID( const std::string& path );
 		std::string GetUID() const noexcept override;
 	protected: