Appropiate method bindings

diff --git a/examples/01.HelloWorld.c b/examples/01.HelloWorld.c
index d630dfc5b922d5f25d7f50c1c5d8bd7308e87864..f350f03f29ca3dde48513a7728fcbf7b9b06b0e6 100644 (file)
--- a/examples/01.HelloWorld.c
+++ b/examples/01.HelloWorld.c
@@ -62,10 +62,10 @@ int main()
 
   if (node)
     {
-      irr_scene_setMaterialFlagAM(node, irr_video_EMF_LIGHTING, 0);
+      irr_scene_setMaterialFlag(node, irr_video_EMF_LIGHTING, 0);
       irr_scene_setMD2Animation(node, irr_scene_EMAT_STAND);
       irr_video_ITexture* texture = irr_video_getTexture(driver, "media/sydney.bmp");
-      irr_scene_setMaterialTextureAM(node, 0, texture);
+      irr_scene_setMaterialTexture(node, 0, texture);
     }
 
   // camera

diff --git a/examples/02.Quake3Map.c b/examples/02.Quake3Map.c
index fe1351e6ff8fda1d16d9d939265acf53205d138c..bbc2c0fa0c10be533291dfa3dff9d7847b7ae533 100644 (file)
--- a/examples/02.Quake3Map.c
+++ b/examples/02.Quake3Map.c
@@ -69,7 +69,7 @@ int main()
   irr_scene_ISceneNode* node;
 
   if (mesh)
-    node = irr_scene_addOctreeSceneNodeAM(smgr, mesh, NULL, -1, 512, 0);
+    node = irr_scene_addOctreeSceneNode(smgr, mesh, NULL, -1, 512, 0);
 
   if (node)
     {

diff --git a/include/IAnimatedMeshSceneNode.h b/include/IAnimatedMeshSceneNode.h
index 7626ad522b1a772d2fea82f921e7d61dbfbb9599..9f424755e2e5b964bad752ca4fd48e0d17f4df3e 100644 (file)
--- a/include/IAnimatedMeshSceneNode.h
+++ b/include/IAnimatedMeshSceneNode.h
@@ -22,9 +22,7 @@
 #ifndef __C_I_ANIMATED_MESH_SCENE_NODE_H_INCLUDED__
 #define __C_I_ANIMATED_MESH_SCENE_NODE_H_INCLUDED__
 
-#include "EMaterialFlags.h"
 #include "IAnimatedMeshMD2.h"
-#include "ITexture.h"
 
 typedef void irr_scene_IAnimatedMeshSceneNode;
 
@@ -32,16 +30,6 @@ typedef void irr_scene_IAnimatedMeshSceneNode;
 extern "C" {
 #endif
 
-  void
-  irr_scene_setMaterialFlagAM(irr_scene_IAnimatedMeshSceneNode* node,
-                              irr_video_E_MATERIAL_FLAG flag,
-                              int newvalue);
-
-  void
-  irr_scene_setMaterialTextureAM(irr_scene_IAnimatedMeshSceneNode* node,
-                                 unsigned int textureLayer,
-                                 irr_video_ITexture* texture);
-
   int
   irr_scene_setMD2Animation(irr_scene_IAnimatedMeshSceneNode* node,
                             irr_scene_EMD2_ANIMATION_TYPE anim);

diff --git a/include/ISceneManager.h b/include/ISceneManager.h
index fdcd419c256c745b0c0f3667cac5ad6ff2d76721..e87b5a7018b46fa856dafd1682cfd9ef696d819c 100644 (file)
--- a/include/ISceneManager.h
+++ b/include/ISceneManager.h
@@ -82,12 +82,12 @@ extern "C" {
                                irr_video_SMaterial* (*getMaterial)(unsigned int i));
 
   irr_scene_IMeshSceneNode*
-  irr_scene_addOctreeSceneNodeAM(irr_scene_ISceneManager* smgr,
-                                 irr_scene_IAnimatedMesh* mesh,
-                                 irr_scene_ISceneNode* parent,
-                                 int id,
-                                 int minimalPolysPerNode,
-                                 int alsoAddIfMeshPointerZero);
+  irr_scene_addOctreeSceneNode(irr_scene_ISceneManager* smgr,
+                               irr_scene_IAnimatedMesh* mesh,
+                               irr_scene_ISceneNode* parent,
+                               int id,
+                               int minimalPolysPerNode,
+                               int alsoAddIfMeshPointerZero);
 
   void
   irr_scene_drawAll(irr_scene_ISceneManager* smgr);

diff --git a/src/IAnimatedMeshSceneNode.cpp b/src/IAnimatedMeshSceneNode.cpp
index 319046b00acb7dbfd1c0cfc37a6bbc7c721a82d8..b8920fce55be84048a1f35b6a58fc135c891f43e 100644 (file)
--- a/src/IAnimatedMeshSceneNode.cpp
+++ b/src/IAnimatedMeshSceneNode.cpp
@@ -23,26 +23,6 @@
 #include "IAnimatedMeshSceneNode.h"
 
 extern "C" {
-  void
-  irr_scene_setMaterialFlagAM(irr_scene_IAnimatedMeshSceneNode* node,
-                              irr_video_E_MATERIAL_FLAG flag,
-                              int newvalue)
-  {
-    ((irr::scene::IAnimatedMeshSceneNode*)node)
-      ->setMaterialFlag((irr::video::E_MATERIAL_FLAG)flag,
-                        newvalue);
-  }
-
-  void
-  irr_scene_setMaterialTextureAM(irr_scene_IAnimatedMeshSceneNode* node,
-                                 unsigned int textureLayer,
-                                 irr_video_ITexture* texture)
-  {
-    ((irr::scene::IAnimatedMeshSceneNode*)node)
-      ->setMaterialTexture(textureLayer,
-                           (irr::video::ITexture*)texture);
-  }
-
   int
   irr_scene_setMD2Animation(irr_scene_IAnimatedMeshSceneNode* node,
                             irr_scene_EMD2_ANIMATION_TYPE anim)

diff --git a/src/ISceneManager.cpp b/src/ISceneManager.cpp
index 7edf4cf6e432fc8414a7080d8c0fd67d66130fb9..358521607481be30e508ac955724cd02db99da56 100644 (file)
--- a/src/ISceneManager.cpp
+++ b/src/ISceneManager.cpp
@@ -224,12 +224,12 @@ extern "C" {
   }
 
   irr_scene_IMeshSceneNode*
-  irr_scene_addOctreeSceneNodeAM(irr_scene_ISceneManager* smgr,
-                                 irr_scene_IAnimatedMesh* mesh,
-                                 irr_scene_ISceneNode* parent,
-                                 int id,
-                                 int minimalPolysPerNode,
-                                 int alsoAddIfMeshPointerZero)
+  irr_scene_addOctreeSceneNode(irr_scene_ISceneManager* smgr,
+                               irr_scene_IAnimatedMesh* mesh,
+                               irr_scene_ISceneNode* parent,
+                               int id,
+                               int minimalPolysPerNode,
+                               int alsoAddIfMeshPointerZero)
   {
     return ((irr::scene::ISceneManager*)smgr)
       ->addOctreeSceneNode((irr::scene::IAnimatedMesh*)mesh,