X-Git-Url: https://git.jsancho.org/?p=c-irrlicht.git;a=blobdiff_plain;f=src%2FISceneManager.cpp;fp=src%2FISceneManager.cpp;h=f4f2c87e6b05b757a0e8a024f01ec9b85eaa8b63;hp=358521607481be30e508ac955724cd02db99da56;hb=59b625c207d1ee8368f04f3c4d675fa393fe94f4;hpb=7e46627fbadd2bcf8169ae429e6fe0a546d2797a

diff --git a/src/ISceneManager.cpp b/src/ISceneManager.cpp
index 3585216..f4f2c87 100644
--- a/src/ISceneManager.cpp
+++ b/src/ISceneManager.cpp
@@ -26,7 +26,7 @@ class CustomSceneNode : public irr::scene::ISceneNode
 {
   void (*Render)();
   irr_core_aabbox3d_f32* (*GetBoundingBox)();
-  int (*GetMaterialCount)();
+  uint32_t (*GetMaterialCount)();
   irr_video_SMaterial* (*GetMaterial)(unsigned int i);
 
 public:
@@ -38,7 +38,7 @@ public:
                   const irr::core::vector3df& scale,
                   void (*render)(),
                   irr_core_aabbox3d_f32* (*getBoundingBox)(),
-                  int (*getMaterialCount)(),
+                  uint32_t (*getMaterialCount)(),
                   irr_video_SMaterial* (*getMaterial)(unsigned int i))
   : irr::scene::ISceneNode(parent, smgr, id, position, rotation, scale)
   {
@@ -89,11 +89,11 @@ extern "C" {
   irr_scene_addAnimatedMeshSceneNode(irr_scene_ISceneManager* smgr,
                                      irr_scene_IAnimatedMesh* mesh,
                                      irr_scene_ISceneNode* parent,
-                                     int id,
+                                     int32_t id,
                                      irr_core_vector3df* position,
                                      irr_core_vector3df* rotation,
                                      irr_core_vector3df* scale,
-                                     int alsoAddIfMeshPointerZero)
+                                     bool alsoAddIfMeshPointerZero)
   {
     const irr::core::vector3df iPosition =
       position ?
@@ -126,8 +126,8 @@ extern "C" {
                                irr_scene_ISceneNode* parent,
                                irr_core_vector3df* position,
                                irr_core_vector3df* lookat,
-                               int id,
-                               int makeActive)
+                               int32_t id,
+                               bool makeActive)
   {
     const irr::core::vector3df& iPosition =
       position ?
@@ -151,15 +151,15 @@ extern "C" {
   irr_scene_ICameraSceneNode*
   irr_scene_addCameraSceneNodeFPS(irr_scene_ISceneManager* smgr,
                                   irr_scene_ISceneNode* parent,
-                                  float rotateSpeed,
-                                  float moveSpeed,
-                                  int id,
+                                  float_t rotateSpeed,
+                                  float_t moveSpeed,
+                                  int32_t id,
                                   irr_SkeyMap* keyMapArray,
-                                  int keyMapSize,
-                                  int noVerticalMovement,
-                                  float jumpSpeed,
-                                  int invertMouse,
-                                  int makeActive)
+                                  int32_t keyMapSize,
+                                  bool noVerticalMovement,
+                                  float_t jumpSpeed,
+                                  bool invertMouse,
+                                  bool makeActive)
   {
     return ((irr::scene::ISceneManager*)smgr)
       ->addCameraSceneNodeFPS((irr::scene::ISceneNode*)parent,
@@ -177,13 +177,13 @@ extern "C" {
   irr_scene_ISceneNode*
   irr_scene_addCustomSceneNode(irr_scene_ISceneManager* smgr,
                                irr_scene_ISceneNode* parent,
-                               int id,
+                               int32_t id,
                                irr_core_vector3df* position,
                                irr_core_vector3df* rotation,
                                irr_core_vector3df* scale,
                                void (*render)(),
                                irr_core_aabbox3d_f32* (*getBoundingBox)(),
-                               int (*getMaterialCount)(),
+                               uint32_t (*getMaterialCount)(),
                                irr_video_SMaterial* (*getMaterial)(unsigned int i))
   {
     if (parent == NULL)
@@ -217,9 +217,6 @@ extern "C" {
                           getBoundingBox,
                           getMaterialCount,
                           getMaterial);
-    //node->drop();
-    //node = 0;
-    //return NULL;
     return node;
   }
 
@@ -227,9 +224,9 @@ extern "C" {
   irr_scene_addOctreeSceneNode(irr_scene_ISceneManager* smgr,
                                irr_scene_IAnimatedMesh* mesh,
                                irr_scene_ISceneNode* parent,
-                               int id,
-                               int minimalPolysPerNode,
-                               int alsoAddIfMeshPointerZero)
+                               int32_t id,
+                               int32_t minimalPolysPerNode,
+                               bool alsoAddIfMeshPointerZero)
   {
     return ((irr::scene::ISceneManager*)smgr)
       ->addOctreeSceneNode((irr::scene::IAnimatedMesh*)mesh,