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:
@@ -7,6 +7,7 @@
|
||||
|
||||
#include "IMeshSceneNode.h"
|
||||
#include "SMesh.h"
|
||||
#include "IGeometryCreator.h"
|
||||
|
||||
namespace irr
|
||||
{
|
||||
@@ -20,7 +21,8 @@ namespace scene
|
||||
CCubeSceneNode(f32 size, ISceneNode* parent, ISceneManager* mgr, s32 id,
|
||||
const core::vector3df& position = core::vector3df(0,0,0),
|
||||
const core::vector3df& rotation = core::vector3df(0,0,0),
|
||||
const core::vector3df& scale = core::vector3df(1.0f, 1.0f, 1.0f));
|
||||
const core::vector3df& scale = core::vector3df(1.0f, 1.0f, 1.0f),
|
||||
ECUBE_MESH_TYPE type=ECMT_1BUF_12VTX_NA);
|
||||
|
||||
virtual ~CCubeSceneNode();
|
||||
|
||||
@@ -84,6 +86,7 @@ namespace scene
|
||||
IMesh* Mesh;
|
||||
IShadowVolumeSceneNode* Shadow;
|
||||
f32 Size;
|
||||
ECUBE_MESH_TYPE MeshType;
|
||||
};
|
||||
|
||||
} // end namespace scene
|
||||
|
Reference in New Issue
Block a user