Merging r6468 through r6486 from trunk to ogl-es branch
Also updating ES&ES2 interface to work with removal of IMaterialRendererServices::setBasicRenderStates git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6487 dfc29bdd-3216-0410-991c-e03cc46cb475
This commit is contained in:
@@ -17,7 +17,11 @@ namespace scene
|
||||
//! Only transform the position of the node transformation matrix
|
||||
//! by the parent transformation matrix.
|
||||
//! Parent will not affect the rotation/scale of the node transformation.
|
||||
ESNUA_TRANSFORM_POSITION
|
||||
ESNUA_TRANSFORM_POSITION,
|
||||
|
||||
//! Use the relative matrix as absolute transformation matrix
|
||||
//! Parent node transformation is ignored just like when the parent is set to 0
|
||||
ESNUA_RELATIVE
|
||||
};
|
||||
|
||||
//! Names for culling type
|
||||
@@ -25,6 +29,7 @@ namespace scene
|
||||
{
|
||||
"matrix",
|
||||
"pos",
|
||||
"relative",
|
||||
0
|
||||
};
|
||||
|
||||
|
Reference in New Issue
Block a user