1
0

Merging r6288 through r6336 from trunk to ogl-es branch

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6337 dfc29bdd-3216-0410-991c-e03cc46cb475
This commit is contained in:
cutealien
2022-04-15 18:51:09 +00:00
parent 67469c8899
commit 2d63fdba3d
115 changed files with 1828 additions and 1154 deletions

View File

@@ -46,7 +46,7 @@ enum eItemSubGroup
CHAINGUN,
};
//! aplly a special effect to the shader
//! apply a special effect to the shader
enum eItemSpecialEffect
{
SPECIAL_SFX_NONE = 0,
@@ -55,7 +55,7 @@ enum eItemSpecialEffect
SPECIAL_SFX_ROTATE_1 = 4,
};
// a List for defining a model
// a list for defining a model
struct SItemElement
{
const c8 *key;
@@ -124,11 +124,11 @@ funcptr_createDeviceEx load_createDeviceEx ( const c8 * filename);
/*
get the current collision respone camera animator
get the current collision response camera animator
*/
ISceneNodeAnimatorCollisionResponse* camCollisionResponse( IrrlichtDevice * device );
//! internal Animation
//! internal animation
enum eTimeFireFlag
{
FIRED = 1,