Commit 6cf999bc authored by hybrid's avatar hybrid

Fix warnings/errors from latest updates.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@2200 dfc29bdd-3216-0410-991c-e03cc46cb475
parent c130d56b
...@@ -109,8 +109,9 @@ namespace video ...@@ -109,8 +109,9 @@ namespace video
case EBF_ONE_MINUS_DST_ALPHA: case EBF_ONE_MINUS_DST_ALPHA:
case EBF_SRC_ALPHA_SATURATE: case EBF_SRC_ALPHA_SATURATE:
return true; return true;
default:
return false;
} }
return false;
} }
......
...@@ -255,8 +255,12 @@ namespace scene ...@@ -255,8 +255,12 @@ namespace scene
u32 index = 0; u32 index = 0;
switch ( state ) switch ( state )
{ {
case video::ETS_PROJECTION: index = SViewFrustum::ETS_PROJECTION; break; case video::ETS_PROJECTION:
case video::ETS_VIEW: index = SViewFrustum::ETS_VIEW; break; index = SViewFrustum::ETS_PROJECTION; break;
case video::ETS_VIEW:
index = SViewFrustum::ETS_VIEW; break;
default:
break;
} }
return Matrices [ index ]; return Matrices [ index ];
} }
...@@ -269,8 +273,12 @@ namespace scene ...@@ -269,8 +273,12 @@ namespace scene
u32 index = 0; u32 index = 0;
switch ( state ) switch ( state )
{ {
case video::ETS_PROJECTION: index = SViewFrustum::ETS_PROJECTION; break; case video::ETS_PROJECTION:
case video::ETS_VIEW: index = SViewFrustum::ETS_VIEW; break; index = SViewFrustum::ETS_PROJECTION; break;
case video::ETS_VIEW:
index = SViewFrustum::ETS_VIEW; break;
default:
break;
} }
return Matrices [ index ]; return Matrices [ index ];
} }
......
...@@ -56,8 +56,7 @@ namespace scene ...@@ -56,8 +56,7 @@ namespace scene
virtual gui::IGUIEnvironment* getGUIEnvironment(); virtual gui::IGUIEnvironment* getGUIEnvironment();
//! return the filesystem //! return the filesystem
virtual io::IFileSystem* CSceneManager::getFileSystem(); virtual io::IFileSystem* getFileSystem();
//! adds Volume Lighting Scene Node. //! adds Volume Lighting Scene Node.
//! the returned pointer must not be dropped. //! the returned pointer must not be dropped.
......
...@@ -520,7 +520,7 @@ void CTRTextureBlend::fragment_src_color_src_alpha () ...@@ -520,7 +520,7 @@ void CTRTextureBlend::fragment_src_color_src_alpha ()
getSample_texture ( a0, r0, g0, b0, &IT[0], tofix ( line.t[0][0].x,iw), tofix ( line.t[0][0].y,iw) ); getSample_texture ( a0, r0, g0, b0, &IT[0], tofix ( line.t[0][0].x,iw), tofix ( line.t[0][0].y,iw) );
color_to_fix ( r1, g1, b1, dst[i] ); color_to_fix ( r1, g1, b1, dst[i] );
u32 check = imulFix_tex1( r0, r1 ); // u32 check = imulFix_tex1( r0, r1 );
dst[i] = fix_to_color ( clampfix_maxcolor ( imulFix_tex1( r0, r1 ) + imulFix_tex1( r1, a0 ) ), dst[i] = fix_to_color ( clampfix_maxcolor ( imulFix_tex1( r0, r1 ) + imulFix_tex1( r1, a0 ) ),
clampfix_maxcolor ( imulFix_tex1( g0, g1 ) + imulFix_tex1( g1, a0 ) ), clampfix_maxcolor ( imulFix_tex1( g0, g1 ) + imulFix_tex1( g1, a0 ) ),
clampfix_maxcolor ( imulFix_tex1( b0, b1 ) + imulFix_tex1( b1, a0 ) ) clampfix_maxcolor ( imulFix_tex1( b0, b1 ) + imulFix_tex1( b1, a0 ) )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment