zaki/irrlicht
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed warning in software driver.

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1388 dfc29bdd-3216-0410-991c-e03cc46cb475
This commit is contained in:
hybrid 2008-06-19 13:09:57 +00:00
parent 4dc82327d4
commit 26682d0102
3 changed files with 7 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/Irrlicht/CDMFLoader.cpp
View File

@ -98,7 +98,7 @@ IAnimatedMesh* CDMFLoader::createMesh(io::IReadFile* file)
if (GetDMFHeader(dmfRawFile, header)) if (GetDMFHeader(dmfRawFile, header))
{ {
//let's set ambient light //let's set ambient light
SceneMgr->setAmbientLight( header.dmfAmbient); SceneMgr->setAmbientLight(header.dmfAmbient);
//let's create the correct number of materials, vertices and faces //let's create the correct number of materials, vertices and faces
dmfMaterial *materiali=new dmfMaterial[header.numMaterials]; dmfMaterial *materiali=new dmfMaterial[header.numMaterials];

16
source/Irrlicht/CSoftwareDriver.cpp
View File

@ -19,8 +19,9 @@ namespace video
//! constructor //! constructor
CSoftwareDriver::CSoftwareDriver(const core::dimension2d<s32>& windowSize, bool fullscreen, io::IFileSystem* io, video::IImagePresenter* presenter) CSoftwareDriver::CSoftwareDriver(const core::dimension2d<s32>& windowSize, bool fullscreen, io::IFileSystem* io, video::IImagePresenter* presenter)
: CNullDriver(io, windowSize), RenderTargetTexture(0), RenderTargetSurface(0), : CNullDriver(io, windowSize), BackBuffer(0), Presenter(presenter),
CurrentTriangleRenderer(0), ZBuffer(0), Texture(0), Presenter(presenter) RenderTargetTexture(0), RenderTargetSurface(0),
CurrentTriangleRenderer(0), ZBuffer(0), Texture(0)
{ {
#ifdef _DEBUG #ifdef _DEBUG
setDebugName("CSoftwareDriver"); setDebugName("CSoftwareDriver");
@ -683,7 +684,6 @@ void CSoftwareDriver::drawClippedIndexedTriangleListT(const VERTEXTYPE* vertices
} }
//! Draws a 3d line. //! Draws a 3d line.
void CSoftwareDriver::draw3DLine(const core::vector3df& start, void CSoftwareDriver::draw3DLine(const core::vector3df& start,
const core::vector3df& end, SColor color) const core::vector3df& end, SColor color)
@ -711,22 +711,12 @@ void CSoftwareDriver::draw3DLine(const core::vector3df& start,
} }
//! clips a triangle against the viewing frustum //! clips a triangle against the viewing frustum
void CSoftwareDriver::clipTriangle(f32* transformedPos) void CSoftwareDriver::clipTriangle(f32* transformedPos)
{ {
} }
//! creates the clipping planes from the matrix
void CSoftwareDriver::createPlanes(const core::matrix4& mat)
{
Frustum = scene::SViewFrustum(mat);
}
//! Only used by the internal engine. Used to notify the driver that //! Only used by the internal engine. Used to notify the driver that
//! the window was resized. //! the window was resized.
void CSoftwareDriver::OnResize(const core::dimension2d<s32>& size) void CSoftwareDriver::OnResize(const core::dimension2d<s32>& size)

18
source/Irrlicht/CSoftwareDriver.h
View File

@ -109,21 +109,12 @@ namespace video
protected: protected:
struct splane
{
core::vector3df Normal;
f32 Dist;
};
//! sets a render target //! sets a render target
void setRenderTarget(video::CImage* image); void setRenderTarget(video::CImage* image);
//! sets the current Texture //! sets the current Texture
bool setTexture(video::ITexture* texture); bool setTexture(video::ITexture* texture);
video::CImage* BackBuffer;
video::IImagePresenter* Presenter;
//! switches to a triangle renderer //! switches to a triangle renderer
void switchToTriangleRenderer(ETriangleRenderer renderer); void switchToTriangleRenderer(ETriangleRenderer renderer);
@ -133,13 +124,13 @@ namespace video
//! clips a triangle agains the viewing frustum //! clips a triangle agains the viewing frustum
void clipTriangle(f32* transformedPos); void clipTriangle(f32* transformedPos);
//! creates the clipping planes from the view matrix
void createPlanes(const core::matrix4& mat);
template<class VERTEXTYPE> template<class VERTEXTYPE>
void drawClippedIndexedTriangleListT(const VERTEXTYPE* vertices, void drawClippedIndexedTriangleListT(const VERTEXTYPE* vertices,
s32 vertexCount, const u16* indexList, s32 triangleCount); s32 vertexCount, const u16* indexList, s32 triangleCount);
video::CImage* BackBuffer;
video::IImagePresenter* Presenter;
core::array<S2DVertex> TransformedPoints; core::array<S2DVertex> TransformedPoints;
video::ITexture* RenderTargetTexture; video::ITexture* RenderTargetTexture;
@ -157,11 +148,8 @@ namespace video
IZBuffer* ZBuffer; IZBuffer* ZBuffer;
video::ITexture* Texture; video::ITexture* Texture;
scene::SViewFrustum Frustum;
SMaterial Material; SMaterial Material;
splane planes[6]; // current planes of the view frustum
}; };
} // end namespace video } // end namespace video