From 2806f03eafc48ec9ef02a3dc2d74133eaf11ccc1 Mon Sep 17 00:00:00 2001 From: Javier Sancho Date: Wed, 11 Mar 2020 19:23:20 +0100 Subject: [PATCH] rename files --- Makefile.am | 26 +++++++++---------- ...eNode.cpp => animated-mesh-scene-node.cpp} | 2 +- ...SceneNode.h => animated-mesh-scene-node.h} | 4 +-- src/{IAnimatedMesh.cpp => animated-mesh.cpp} | 2 +- src/{IAnimatedMesh.h => animated-mesh.h} | 4 +-- src/{IrrlichtDevice.cpp => device.cpp} | 10 +++---- src/{IrrlichtDevice.h => device.h} | 4 +-- src/dimension2d.h | 4 +-- src/{EDriverTypes.cpp => driver-types.cpp} | 5 ++-- src/{EDriverTypes.h => driver-types.h} | 4 +-- src/{IGUIElement.cpp => gui-element.cpp} | 2 +- src/{IGUIElement.h => gui-element.h} | 4 +-- ...GUIEnvironment.cpp => gui-environment.cpp} | 7 ++--- src/{IGUIEnvironment.h => gui-environment.h} | 4 +-- ...IGUIStaticText.cpp => gui-static-text.cpp} | 2 +- src/{IGUIStaticText.h => gui-static-text.h} | 4 +-- src/{GuileIrrlicht.cpp => guile-irrlicht.cpp} | 21 ++++++++------- ...{EMaterialFlags.cpp => material-flags.cpp} | 7 ++++- src/{EMaterialFlags.h => material-flags.h} | 4 +-- src/rect.h | 4 +-- ...renceCounted.cpp => reference-counted.cpp} | 4 +-- ...ReferenceCounted.h => reference-counted.h} | 4 +-- src/{ISceneManager.cpp => scene-manager.cpp} | 9 ++++--- src/{ISceneManager.h => scene-manager.h} | 4 +-- src/{ISceneNode.cpp => scene-node.cpp} | 2 +- src/{ISceneNode.h => scene-node.h} | 4 +-- src/vector3d.h | 4 +-- src/{IVideoDriver.cpp => video-driver.cpp} | 2 +- src/{IVideoDriver.h => video-driver.h} | 4 +-- src/wchar.h | 5 ++++ src/wrapped.h | 5 ++++ 31 files changed, 95 insertions(+), 76 deletions(-) rename src/{IAnimatedMeshSceneNode.cpp => animated-mesh-scene-node.cpp} (97%) rename src/{IAnimatedMeshSceneNode.h => animated-mesh-scene-node.h} (90%) rename src/{IAnimatedMesh.cpp => animated-mesh.cpp} (97%) rename src/{IAnimatedMesh.h => animated-mesh.h} (91%) rename src/{IrrlichtDevice.cpp => device.cpp} (95%) rename src/{IrrlichtDevice.h => device.h} (94%) rename src/{EDriverTypes.cpp => driver-types.cpp} (91%) rename src/{EDriverTypes.h => driver-types.h} (90%) rename src/{IGUIElement.cpp => gui-element.cpp} (97%) rename src/{IGUIElement.h => gui-element.h} (91%) rename src/{IGUIEnvironment.cpp => gui-environment.cpp} (96%) rename src/{IGUIEnvironment.h => gui-environment.h} (93%) rename src/{IGUIStaticText.cpp => gui-static-text.cpp} (97%) rename src/{IGUIStaticText.h => gui-static-text.h} (91%) rename src/{GuileIrrlicht.cpp => guile-irrlicht.cpp} (80%) rename src/{EMaterialFlags.cpp => material-flags.cpp} (94%) rename src/{EMaterialFlags.h => material-flags.h} (90%) rename src/{IReferenceCounted.cpp => reference-counted.cpp} (95%) rename src/{IReferenceCounted.h => reference-counted.h} (89%) rename src/{ISceneManager.cpp => scene-manager.cpp} (96%) rename src/{ISceneManager.h => scene-manager.h} (94%) rename src/{ISceneNode.cpp => scene-node.cpp} (97%) rename src/{ISceneNode.h => scene-node.h} (91%) rename src/{IVideoDriver.cpp => video-driver.cpp} (97%) rename src/{IVideoDriver.h => video-driver.h} (91%) diff --git a/Makefile.am b/Makefile.am index 8f92257..1bdd2ce 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,22 +1,22 @@ ACLOCAL_AMFLAGS = -I m4 lib_LTLIBRARIES = libguile-irrlicht.la libguile_irrlicht_la_SOURCES = \ + src/animated-mesh.cpp \ + src/animated-mesh-scene-node.cpp \ + src/device.cpp \ src/dimension2d.cpp \ - src/EDriverTypes.cpp \ - src/EMaterialFlags.cpp \ - src/GuileIrrlicht.cpp \ - src/IAnimatedMesh.cpp \ - src/IAnimatedMeshSceneNode.cpp \ - src/IGUIElement.cpp \ - src/IGUIEnvironment.cpp \ - src/IGUIStaticText.cpp \ - src/IrrlichtDevice.cpp \ - src/ISceneManager.cpp \ - src/ISceneNode.cpp \ - src/IReferenceCounted.cpp \ - src/IVideoDriver.cpp \ + src/driver-types.cpp \ + src/gui-element.cpp \ + src/gui-environment.cpp \ + src/gui-static-text.cpp \ + src/guile-irrlicht.cpp \ + src/material-flags.cpp \ src/rect.cpp \ + src/reference-counted.cpp \ + src/scene-manager.cpp \ + src/scene-node.cpp \ src/vector3d.cpp \ + src/video-driver.cpp \ src/wchar.cpp libguile_irrlicht_la_CPPFLAGS = @GUILE_CFLAGS@ libguile_irrlicht_la_LDFLAGS = \ diff --git a/src/IAnimatedMeshSceneNode.cpp b/src/animated-mesh-scene-node.cpp similarity index 97% rename from src/IAnimatedMeshSceneNode.cpp rename to src/animated-mesh-scene-node.cpp index ae6e29c..be46b3a 100644 --- a/src/IAnimatedMeshSceneNode.cpp +++ b/src/animated-mesh-scene-node.cpp @@ -21,7 +21,7 @@ #include #include -#include "IAnimatedMeshSceneNode.h" +#include "animated-mesh-scene-node.h" #include "wrapped.h" extern "C" { diff --git a/src/IAnimatedMeshSceneNode.h b/src/animated-mesh-scene-node.h similarity index 90% rename from src/IAnimatedMeshSceneNode.h rename to src/animated-mesh-scene-node.h index b4dfd9b..9858cf2 100644 --- a/src/IAnimatedMeshSceneNode.h +++ b/src/animated-mesh-scene-node.h @@ -19,8 +19,8 @@ . */ -#ifndef __GUILE_I_ANIMATED_MESH_SCENE_NODE_INCLUDED__ -#define __GUILE_I_ANIMATED_MESH_SCENE_NODE_INCLUDED__ +#ifndef __GUILE_IRRLICHT_ANIMATED_MESH_SCENE_NODE_H_INCLUDED__ +#define __GUILE_IRRLICHT_ANIMATED_MESH_SCENE_NODE_H_INCLUDED__ #include #include diff --git a/src/IAnimatedMesh.cpp b/src/animated-mesh.cpp similarity index 97% rename from src/IAnimatedMesh.cpp rename to src/animated-mesh.cpp index 883527e..9f461a2 100644 --- a/src/IAnimatedMesh.cpp +++ b/src/animated-mesh.cpp @@ -21,7 +21,7 @@ #include #include -#include "IAnimatedMesh.h" +#include "animated-mesh.h" #include "wrapped.h" extern "C" { diff --git a/src/IAnimatedMesh.h b/src/animated-mesh.h similarity index 91% rename from src/IAnimatedMesh.h rename to src/animated-mesh.h index b9f77c3..f063b39 100644 --- a/src/IAnimatedMesh.h +++ b/src/animated-mesh.h @@ -19,8 +19,8 @@ . */ -#ifndef __GUILE_I_ANIMATED_MESH_INCLUDED__ -#define __GUILE_I_ANIMATED_MESH_INCLUDED__ +#ifndef __GUILE_IRRLICHT_ANIMATED_MESH_H_INCLUDED__ +#define __GUILE_IRRLICHT_ANIMATED_MESH_H_INCLUDED__ #include #include diff --git a/src/IrrlichtDevice.cpp b/src/device.cpp similarity index 95% rename from src/IrrlichtDevice.cpp rename to src/device.cpp index 9cccd58..bb43ddb 100644 --- a/src/IrrlichtDevice.cpp +++ b/src/device.cpp @@ -22,12 +22,12 @@ #include #include +#include "device.h" #include "dimension2d.h" -#include "EDriverTypes.h" -#include "IGUIEnvironment.h" -#include "IrrlichtDevice.h" -#include "ISceneManager.h" -#include "IVideoDriver.h" +#include "driver-types.h" +#include "gui-environment.h" +#include "scene-manager.h" +#include "video-driver.h" #include "wchar.h" #include "wrapped.h" diff --git a/src/IrrlichtDevice.h b/src/device.h similarity index 94% rename from src/IrrlichtDevice.h rename to src/device.h index 898341b..0f3d243 100644 --- a/src/IrrlichtDevice.h +++ b/src/device.h @@ -19,8 +19,8 @@ . */ -#ifndef __GUILE_IRRLICHT_DEVICE_INCLUDED__ -#define __GUILE_IRRLICHT_DEVICE_INCLUDED__ +#ifndef __GUILE_IRRLICHT_DEVICE_H_INCLUDED__ +#define __GUILE_IRRLICHT_DEVICE_H_INCLUDED__ #include #include diff --git a/src/dimension2d.h b/src/dimension2d.h index 86336c6..5556e8a 100644 --- a/src/dimension2d.h +++ b/src/dimension2d.h @@ -19,8 +19,8 @@ . */ -#ifndef __GUILE_IRRLICHT_DIMENSION_2D_INCLUDED__ -#define __GUILE_IRRLICHT_DIMENSION_2D_INCLUDED__ +#ifndef __GUILE_IRRLICHT_DIMENSION_2D_H_INCLUDED__ +#define __GUILE_IRRLICHT_DIMENSION_2D_H_INCLUDED__ #include #include diff --git a/src/EDriverTypes.cpp b/src/driver-types.cpp similarity index 91% rename from src/EDriverTypes.cpp rename to src/driver-types.cpp index 8b3f678..886d40d 100644 --- a/src/EDriverTypes.cpp +++ b/src/driver-types.cpp @@ -21,7 +21,7 @@ #include #include -#include "EDriverTypes.h" +#include "driver-types.h" extern "C" { @@ -55,7 +55,8 @@ extern "C" { } else { - return irr::video::EDT_NULL; + scm_error (scm_arg_type_key, NULL, "Wrong driver type: ~S", + scm_list_1 (driver_type), scm_list_1 (driver_type)); } } diff --git a/src/EDriverTypes.h b/src/driver-types.h similarity index 90% rename from src/EDriverTypes.h rename to src/driver-types.h index 0c16c75..dff3802 100644 --- a/src/EDriverTypes.h +++ b/src/driver-types.h @@ -19,8 +19,8 @@ . */ -#ifndef __GUILE_IRRLICHT_E_DRIVER_TYPES_INCLUDED__ -#define __GUILE_IRRLICHT_E_DRIVER_TYPES_INCLUDED__ +#ifndef __GUILE_IRRLICHT_DRIVER_TYPES_H_INCLUDED__ +#define __GUILE_IRRLICHT_DRIVER_TYPES_H_INCLUDED__ #include #include diff --git a/src/IGUIElement.cpp b/src/gui-element.cpp similarity index 97% rename from src/IGUIElement.cpp rename to src/gui-element.cpp index 810fdb6..e93872d 100644 --- a/src/IGUIElement.cpp +++ b/src/gui-element.cpp @@ -21,7 +21,7 @@ #include #include -#include "IGUIElement.h" +#include "gui-element.h" #include "wrapped.h" extern "C" { diff --git a/src/IGUIElement.h b/src/gui-element.h similarity index 91% rename from src/IGUIElement.h rename to src/gui-element.h index ab8db92..1e290ae 100644 --- a/src/IGUIElement.h +++ b/src/gui-element.h @@ -19,8 +19,8 @@ . */ -#ifndef __GUILE_I_GUI_ELEMENT_INCLUDED__ -#define __GUILE_I_GUI_ELEMENT_INCLUDED__ +#ifndef __GUILE_IRRLICHT_GUI_ELEMENT_H_INCLUDED__ +#define __GUILE_IRRLICHT_GUI_ELEMENT_H_INCLUDED__ #include #include diff --git a/src/IGUIEnvironment.cpp b/src/gui-environment.cpp similarity index 96% rename from src/IGUIEnvironment.cpp rename to src/gui-environment.cpp index bea7f1e..76dc57c 100644 --- a/src/IGUIEnvironment.cpp +++ b/src/gui-environment.cpp @@ -21,9 +21,10 @@ #include #include -#include "IGUIElement.h" -#include "IGUIEnvironment.h" -#include "IGUIStaticText.h" + +#include "gui-element.h" +#include "gui-environment.h" +#include "gui-static-text.h" #include "rect.h" #include "wchar.h" #include "wrapped.h" diff --git a/src/IGUIEnvironment.h b/src/gui-environment.h similarity index 93% rename from src/IGUIEnvironment.h rename to src/gui-environment.h index e4d6731..9b8d636 100644 --- a/src/IGUIEnvironment.h +++ b/src/gui-environment.h @@ -19,8 +19,8 @@ . */ -#ifndef __GUILE_I_GUI_ENVIRONMENT_INCLUDED__ -#define __GUILE_I_GUI_ENVIRONMENT_INCLUDED__ +#ifndef __GUILE_IRRLICHT_GUI_ENVIRONMENT_H_INCLUDED__ +#define __GUILE_IRRLICHT_GUI_ENVIRONMENT_H_INCLUDED__ #include #include diff --git a/src/IGUIStaticText.cpp b/src/gui-static-text.cpp similarity index 97% rename from src/IGUIStaticText.cpp rename to src/gui-static-text.cpp index 2ae1b97..f5a4323 100644 --- a/src/IGUIStaticText.cpp +++ b/src/gui-static-text.cpp @@ -21,7 +21,7 @@ #include #include -#include "IGUIStaticText.h" +#include "gui-static-text.h" #include "wrapped.h" extern "C" { diff --git a/src/IGUIStaticText.h b/src/gui-static-text.h similarity index 91% rename from src/IGUIStaticText.h rename to src/gui-static-text.h index 8fe6492..8dc7a5f 100644 --- a/src/IGUIStaticText.h +++ b/src/gui-static-text.h @@ -19,8 +19,8 @@ . */ -#ifndef __GUILE_I_GUI_STATIC_TEXT_INCLUDED__ -#define __GUILE_I_GUI_STATIC_TEXT_INCLUDED__ +#ifndef __GUILE_IRRLICHT_GUI_STATIC_TEXT_H_INCLUDED__ +#define __GUILE_IRRLICHT_GUI_STATIC_TEXT_H_INCLUDED__ #include #include diff --git a/src/GuileIrrlicht.cpp b/src/guile-irrlicht.cpp similarity index 80% rename from src/GuileIrrlicht.cpp rename to src/guile-irrlicht.cpp index 8b6275f..a73a419 100644 --- a/src/GuileIrrlicht.cpp +++ b/src/guile-irrlicht.cpp @@ -20,16 +20,17 @@ */ #include -#include "IAnimatedMesh.h" -#include "IAnimatedMeshSceneNode.h" -#include "IGUIElement.h" -#include "IGUIEnvironment.h" -#include "IGUIStaticText.h" -#include "IrrlichtDevice.h" -#include "ISceneManager.h" -#include "ISceneNode.h" -#include "IReferenceCounted.h" -#include "IVideoDriver.h" + +#include "animated-mesh.h" +#include "animated-mesh-scene-node.h" +#include "device.h" +#include "gui-element.h" +#include "gui-environment.h" +#include "gui-static-text.h" +#include "reference-counted.h" +#include "scene-manager.h" +#include "scene-node.h" +#include "video-driver.h" extern "C" { diff --git a/src/EMaterialFlags.cpp b/src/material-flags.cpp similarity index 94% rename from src/EMaterialFlags.cpp rename to src/material-flags.cpp index 7c38fe8..df2c884 100644 --- a/src/EMaterialFlags.cpp +++ b/src/material-flags.cpp @@ -21,7 +21,7 @@ #include #include -#include "EMaterialFlags.h" +#include "material-flags.h" extern "C" { @@ -109,6 +109,11 @@ extern "C" { { return irr::video::EMF_POLYGON_OFFSET; } + else + { + scm_error (scm_arg_type_key, NULL, "Wrong material flag: ~S", + scm_list_1 (material_flag), scm_list_1 (material_flag)); + } } } diff --git a/src/EMaterialFlags.h b/src/material-flags.h similarity index 90% rename from src/EMaterialFlags.h rename to src/material-flags.h index be94343..1b1f053 100644 --- a/src/EMaterialFlags.h +++ b/src/material-flags.h @@ -19,8 +19,8 @@ . */ -#ifndef __GUILE_IRRLICHT_E_MATERIAL_FLAGS_INCLUDED__ -#define __GUILE_IRRLICHT_E_MATERIAL_FLAGS_INCLUDED__ +#ifndef __GUILE_IRRLICHT_MATERIAL_FLAGS_H_INCLUDED__ +#define __GUILE_IRRLICHT_MATERIAL_FLAGS_H_INCLUDED__ #include #include diff --git a/src/rect.h b/src/rect.h index bad7aae..4e015a1 100644 --- a/src/rect.h +++ b/src/rect.h @@ -19,8 +19,8 @@ . */ -#ifndef __GUILE_IRRLICHT_RECT_INCLUDED__ -#define __GUILE_IRRLICHT_RECT_INCLUDED__ +#ifndef __GUILE_IRRLICHT_RECT_H_INCLUDED__ +#define __GUILE_IRRLICHT_RECT_H_INCLUDED__ #include #include diff --git a/src/IReferenceCounted.cpp b/src/reference-counted.cpp similarity index 95% rename from src/IReferenceCounted.cpp rename to src/reference-counted.cpp index 0038d18..85634d4 100644 --- a/src/IReferenceCounted.cpp +++ b/src/reference-counted.cpp @@ -22,8 +22,8 @@ #include #include -#include "IReferenceCounted.h" -#include "IrrlichtDevice.h" +#include "device.h" +#include "reference-counted.h" extern "C" { diff --git a/src/IReferenceCounted.h b/src/reference-counted.h similarity index 89% rename from src/IReferenceCounted.h rename to src/reference-counted.h index 6d965d0..f2a2613 100644 --- a/src/IReferenceCounted.h +++ b/src/reference-counted.h @@ -19,8 +19,8 @@ . */ -#ifndef __GUILE_I_REFERENCE_COUNTED_INCLUDED__ -#define __GUILE_I_REFERENCE_COUNTED_INCLUDED__ +#ifndef __GUILE_IRRLICHT_REFERENCE_COUNTED_H_INCLUDED__ +#define __GUILE_IRRLICHT_REFERENCE_COUNTED_H_INCLUDED__ #include #include diff --git a/src/ISceneManager.cpp b/src/scene-manager.cpp similarity index 96% rename from src/ISceneManager.cpp rename to src/scene-manager.cpp index 5e8d2d5..5e81de7 100644 --- a/src/ISceneManager.cpp +++ b/src/scene-manager.cpp @@ -21,10 +21,11 @@ #include #include -#include "IAnimatedMesh.h" -#include "IAnimatedMeshSceneNode.h" -#include "ISceneManager.h" -#include "ISceneNode.h" + +#include "animated-mesh.h" +#include "animated-mesh-scene-node.h" +#include "scene-manager.h" +#include "scene-node.h" #include "vector3d.h" #include "wrapped.h" diff --git a/src/ISceneManager.h b/src/scene-manager.h similarity index 94% rename from src/ISceneManager.h rename to src/scene-manager.h index d5b4b2f..f52d299 100644 --- a/src/ISceneManager.h +++ b/src/scene-manager.h @@ -19,8 +19,8 @@ . */ -#ifndef __GUILE_I_SCENE_MANAGER_INCLUDED__ -#define __GUILE_I_SCENE_MANAGER_INCLUDED__ +#ifndef __GUILE_IRRLICHT_SCENE_MANAGER_H_INCLUDED__ +#define __GUILE_IRRLICHT_SCENE_MANAGER_H_INCLUDED__ #include #include diff --git a/src/ISceneNode.cpp b/src/scene-node.cpp similarity index 97% rename from src/ISceneNode.cpp rename to src/scene-node.cpp index 29b094c..d392aba 100644 --- a/src/ISceneNode.cpp +++ b/src/scene-node.cpp @@ -21,7 +21,7 @@ #include #include -#include "ISceneNode.h" +#include "scene-node.h" #include "wrapped.h" extern "C" { diff --git a/src/ISceneNode.h b/src/scene-node.h similarity index 91% rename from src/ISceneNode.h rename to src/scene-node.h index b663091..64c3626 100644 --- a/src/ISceneNode.h +++ b/src/scene-node.h @@ -19,8 +19,8 @@ . */ -#ifndef __GUILE_I_SCENE_NODE_INCLUDED__ -#define __GUILE_I_SCENE_NODE_INCLUDED__ +#ifndef __GUILE_IRRLICHT_SCENE_NODE_H_INCLUDED__ +#define __GUILE_IRRLICHT_SCENE_NODE_H_INCLUDED__ #include #include diff --git a/src/vector3d.h b/src/vector3d.h index 8862cdf..bc7c9f0 100644 --- a/src/vector3d.h +++ b/src/vector3d.h @@ -19,8 +19,8 @@ . */ -#ifndef __GUILE_IRRLICHT_VECTOR_3D_INCLUDED__ -#define __GUILE_IRRLICHT_VECTOR_3D_INCLUDED__ +#ifndef __GUILE_IRRLICHT_VECTOR_3D_H_INCLUDED__ +#define __GUILE_IRRLICHT_VECTOR_3D_H_INCLUDED__ #include #include diff --git a/src/IVideoDriver.cpp b/src/video-driver.cpp similarity index 97% rename from src/IVideoDriver.cpp rename to src/video-driver.cpp index 839db75..c746db3 100644 --- a/src/IVideoDriver.cpp +++ b/src/video-driver.cpp @@ -21,7 +21,7 @@ #include #include -#include "IVideoDriver.h" +#include "video-driver.h" #include "wrapped.h" extern "C" { diff --git a/src/IVideoDriver.h b/src/video-driver.h similarity index 91% rename from src/IVideoDriver.h rename to src/video-driver.h index df5c3de..1525edf 100644 --- a/src/IVideoDriver.h +++ b/src/video-driver.h @@ -19,8 +19,8 @@ . */ -#ifndef __GUILE_I_VIDEO_DRIVER_INCLUDED__ -#define __GUILE_I_VIDEO_DRIVER_INCLUDED__ +#ifndef __GUILE_IRRLICHT_VIDEO_DRIVER_H_INCLUDED__ +#define __GUILE_IRRLICHT_VIDEO_DRIVER_H_INCLUDED__ #include #include diff --git a/src/wchar.h b/src/wchar.h index d9697d2..7b6119a 100644 --- a/src/wchar.h +++ b/src/wchar.h @@ -19,8 +19,13 @@ . */ +#ifndef __GUILE_IRRLICHT_WCHAR_H_INCLUDED__ +#define __GUILE_IRRLICHT_WCHAR_H_INCLUDED__ + #include #include wchar_t* scm_to_wide_char_string (SCM text); + +#endif diff --git a/src/wrapped.h b/src/wrapped.h index 2412d7e..1f61d95 100644 --- a/src/wrapped.h +++ b/src/wrapped.h @@ -19,6 +19,9 @@ . */ +#ifndef __GUILE_IRRLICHT_WRAPPED_H_INCLUDED__ +#define __GUILE_IRRLICHT_WRAPPED_H_INCLUDED__ + #include #define DECLARE_WRAPPED_TYPE(TYPE, INIT, PRED, WRAP, UNWRAP) \ @@ -70,3 +73,5 @@ { \ return SCM_IS_A_P (wrapped_obj, wrapped_type); \ } + +#endif -- 2.39.5