mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-10-26 14:56:39 +00:00
Code Issues Releases Wiki Activity

fixed more warning messages, updated mangle

Browse source
This commit is contained in:
Nicolay Korslund 2010-06-25 15:23:21 +02:00
parent 261af208cd
commit 1d84b10b3e
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mangle

@ -1 +1 @@
Subproject commit 6b0b7c95f8a40a53b4c26d551d4fb5118deb7e12 Subproject commit 19649bfeaa5a204cc765c7b0a66789919d6681d9

11
nifogre/ogre_nif_loader.cpp
View file

@ -134,7 +134,8 @@ public:
float maxZ() { return Z.max; } float maxZ() { return Z.max; }
}; };
// Conversion of blend / test mode from NIF -> OGRE. Not in use yet. // Conversion of blend / test mode from NIF -> OGRE.
/* Not in use yet, so let's comment it out.
static SceneBlendFactor getBlendFactor(int mode) static SceneBlendFactor getBlendFactor(int mode)
{ {
switch(mode) switch(mode)
@ -149,14 +150,15 @@ static SceneBlendFactor getBlendFactor(int mode)
case 7: return SBF_ONE_MINUS_SOURCE_ALPHA; case 7: return SBF_ONE_MINUS_SOURCE_ALPHA;
case 8: return SBF_DEST_ALPHA; case 8: return SBF_DEST_ALPHA;
case 9: return SBF_ONE_MINUS_DEST_ALPHA; case 9: return SBF_ONE_MINUS_DEST_ALPHA;
/* [Comment from Chris Robinson:] Can't handle this mode? :/ // [Comment from Chris Robinson:] Can't handle this mode? :/
case 10: return SBF_SOURCE_ALPHA_SATURATE; // case 10: return SBF_SOURCE_ALPHA_SATURATE;
*/
default: default:
return SBF_SOURCE_ALPHA; return SBF_SOURCE_ALPHA;
} }
} }
*/
/* This is also unused
static CompareFunction getTestMode(int mode) static CompareFunction getTestMode(int mode)
{ {
switch(mode) switch(mode)
@ -173,6 +175,7 @@ static CompareFunction getTestMode(int mode)
return CMPF_ALWAYS_PASS; return CMPF_ALWAYS_PASS;
} }
} }
*/
static void createMaterial(const String &name, static void createMaterial(const String &name,
const Vector &ambient, const Vector &ambient,