Rename functions and fix some little bugs

[c-irrlicht.git] / examples / 01.HelloWorld.c

diff --git a/examples/01.HelloWorld.c b/examples/01.HelloWorld.c
index 6027d5436d33796e2030faa5aad9a19af1675a95..d630dfc5b922d5f25d7f50c1c5d8bd7308e87864 100644 (file)
--- a/examples/01.HelloWorld.c
+++ b/examples/01.HelloWorld.c
@@ -36,55 +36,53 @@ int main()
     }
 
   // set window caption
-  irr_IrrlichtDevice_setWindowCaption(device, "Hello World! - Irrlicht Engine Demo");
+  irr_setWindowCaption(device, "Hello World! - Irrlicht Engine Demo");
 
   // instances for doing things
-  irr_video_IVideoDriver* driver = irr_IrrlichtDevice_getVideoDriver(device);
-  irr_scene_ISceneManager* smgr = irr_IrrlichtDevice_getSceneManager(device);
-  irr_gui_IGUIEnvironment* guienv = irr_IrrlichtDevice_getGUIEnvironment(device);
+  irr_video_IVideoDriver* driver = irr_getVideoDriver(device);
+  irr_scene_ISceneManager* smgr = irr_getSceneManager(device);
+  irr_gui_IGUIEnvironment* guienv = irr_getGUIEnvironment(device);
 
   // add a static text
   irr_core_rect_s32 box = {10, 10, 260, 22};
-  irr_gui_IGUIEnvironment_addStaticText(guienv,
-                                        "Hello World! This is the Irrlicht Software renderer!",
-                                        &box, 1, 1, NULL, -1, 0);
+  irr_gui_addStaticText(guienv,
+                        "Hello World! This is the Irrlicht Software renderer!",
+                        &box, 1, 1, NULL, -1, 0);
 
   // load a quake2 mesh
-  irr_scene_IAnimatedMesh* mesh = irr_scene_ISceneManager_getMesh(smgr, "media/sydney.md2");
+  irr_scene_IAnimatedMesh* mesh = irr_scene_getMesh(smgr, "media/sydney.md2");
   if (!mesh)
     {
-      irr_IrrlichtDevice_drop(device);
+      irr_drop(device);
       return 1;
     }
   irr_scene_IAnimatedMeshSceneNode* node =
-    irr_scene_ISceneManager_addAnimatedMeshSceneNode(smgr, mesh, NULL, -1,
-                                                     NULL, NULL, NULL, 0);
+    irr_scene_addAnimatedMeshSceneNode(smgr, mesh, NULL, -1,
+                                       NULL, NULL, NULL, 0);
 
   if (node)
     {
-      irr_scene_IAnimatedMeshSceneNode_setMaterialFlag(node, irr_video_EMF_LIGHTING, 0);
-      irr_scene_IAnimatedMeshSceneNode_setMD2Animation(node, irr_scene_EMAT_STAND);
-      irr_video_ITexture* texture = irr_video_IVideoDriver_getTexture(driver,
-                                                                      "media/sydney.bmp");
-      irr_scene_IAnimatedMeshSceneNode_setMaterialTexture(node, 0, texture);
+      irr_scene_setMaterialFlagAM(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);
     }
 
   // camera
   irr_core_vector3df position = {0, 30, -40};
   irr_core_vector3df lookat = {0, 5, 0};
-  irr_scene_ISceneManager_addCameraSceneNode(smgr, NULL, &position, &lookat,
-                                             -1, 1);
+  irr_scene_addCameraSceneNode(smgr, NULL, &position, &lookat, -1, 1);
                                              
   // loop
   irr_video_SColor bgcolor = {255, 100, 101, 140};
-  while (irr_IrrlichtDevice_run(device))
+  while (irr_run(device))
     {
-      irr_video_IVideoDriver_beginScene(driver, 1, 1, &bgcolor, NULL, NULL);
-      irr_gui_IGUIEnvironment_drawAll(guienv);
-      irr_scene_ISceneManager_drawAll(smgr);
-      irr_video_IVideoDriver_endScene(driver);
+      irr_video_beginScene(driver, 1, 1, &bgcolor, NULL, NULL);
+      irr_gui_drawAll(guienv);
+      irr_scene_drawAll(smgr);
+      irr_video_endScene(driver);
     }
 
-  irr_IrrlichtDevice_drop(device);
+  irr_drop(device);
   return 0;
 }