diff options
| author | chai <chaifix@163.com> | 2018-10-29 23:19:19 +0800 |
|---|---|---|
| committer | chai <chaifix@163.com> | 2018-10-29 23:19:19 +0800 |
| commit | a24f5572a38caa47a19c1f8a9bcea43d7ed88d1e (patch) | |
| tree | 430d87a9dc4d99f43f5696d95a5e54b4f5916970 | |
| parent | 1a2d615c0d1cd67a8b5a52595b28b2dfcbfc4186 (diff) | |
*修改头
85 files changed, 190 insertions, 207 deletions
diff --git a/bin/Jin.exe b/bin/Jin.exe Binary files differindex f2d24ba..72487e2 100644 --- a/bin/Jin.exe +++ b/bin/Jin.exe diff --git a/bin/SDL2.dll b/bin/SDL2.dll Binary files differindex 9496bc5..8036cbe 100644 --- a/bin/SDL2.dll +++ b/bin/SDL2.dll diff --git a/build/vc++/examples/ParticleSystem/ParticleSystem.vcxproj.filters b/build/vc++/examples/ParticleSystem/ParticleSystem.vcxproj.filters index fd11df1..fa43442 100644 --- a/build/vc++/examples/ParticleSystem/ParticleSystem.vcxproj.filters +++ b/build/vc++/examples/ParticleSystem/ParticleSystem.vcxproj.filters @@ -1,14 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup> - <Filter Include="src"> - <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier> - <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions> - </Filter> - </ItemGroup> - <ItemGroup> - <ClCompile Include="..\..\..\..\examples\particle_system\main.cpp"> - <Filter>src</Filter> - </ClCompile> + <ClCompile Include="..\..\..\..\examples\particle_system\main.cpp" /> </ItemGroup> </Project>
\ No newline at end of file diff --git a/build/vc++/jin/jin.vcxproj b/build/vc++/jin/jin.vcxproj index b32eeb5..efc5188 100644 --- a/build/vc++/jin/jin.vcxproj +++ b/build/vc++/jin/jin.vcxproj @@ -88,7 +88,7 @@ <Link> <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> - <SubSystem>Console</SubSystem> + <SubSystem>Windows</SubSystem> <AdditionalLibraryDirectories> </AdditionalLibraryDirectories> <AdditionalDependencies>opengl32.lib;%(AdditionalDependencies)</AdditionalDependencies> diff --git a/build/vc++/jin/jin.vcxproj.filters b/build/vc++/jin/jin.vcxproj.filters index b9b2010..c17d229 100644 --- a/build/vc++/jin/jin.vcxproj.filters +++ b/build/vc++/jin/jin.vcxproj.filters @@ -1,13 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup> - <Filter Include="src"> - <UniqueIdentifier>{fa6c1ecb-9418-405c-87c0-511a1f82de88}</UniqueIdentifier> - </Filter> - </ItemGroup> - <ItemGroup> - <ClCompile Include="..\..\..\src\jin\main.cpp"> - <Filter>src</Filter> - </ClCompile> + <ClCompile Include="..\..\..\src\jin\main.cpp" /> </ItemGroup> </Project>
\ No newline at end of file diff --git a/src/3rdparty/buildvm/buildvm.exe b/src/3rdparty/buildvm/buildvm.exe Binary files differindex 53a6c72..3f7515a 100644 --- a/src/3rdparty/buildvm/buildvm.exe +++ b/src/3rdparty/buildvm/buildvm.exe diff --git a/src/3rdparty/minilua/minilua.exe b/src/3rdparty/minilua/minilua.exe Binary files differindex fe95721..f902b70 100644 --- a/src/3rdparty/minilua/minilua.exe +++ b/src/3rdparty/minilua/minilua.exe diff --git a/src/jin/main.cpp b/src/jin/main.cpp index 2144fbc..029436d 100644 --- a/src/jin/main.cpp +++ b/src/jin/main.cpp @@ -20,7 +20,6 @@ static void setParamters(lua_State* L, int argc, char* args[]) luax_setfield(L, -2, "args"); // Push current working directory. // Absolute directory. - // An 1KB buffer. Buffer cwd = Buffer(1024); #ifdef _WIN32 _getcwd((char*)&cwd, cwd.size()); diff --git a/src/libjin/Audio/SDL/je_sdl_audio.h b/src/libjin/Audio/SDL/je_sdl_audio.h index 1b12ac1..77162d4 100644 --- a/src/libjin/Audio/SDL/je_sdl_audio.h +++ b/src/libjin/Audio/SDL/je_sdl_audio.h @@ -1,5 +1,5 @@ -#ifndef __JE_AUDIO_SDL_H -#define __JE_AUDIO_SDL_H +#ifndef __JE_AUDIO_SDL_H__ +#define __JE_AUDIO_SDL_H__ #include "../../core/je_configuration.h" #if defined(jin_audio) && (jin_audio == jin_audio_sdl) @@ -135,4 +135,4 @@ namespace JinEngine #endif // (jin_audio) && (jin_audio == jin_audio_sdl) -#endif // __JE_AUDIO_SDL_H
\ No newline at end of file +#endif // __JE_AUDIO_SDL_H__
\ No newline at end of file diff --git a/src/libjin/Audio/SDL/je_sdl_source.h b/src/libjin/Audio/SDL/je_sdl_source.h index 42ac255..bbc8c7a 100644 --- a/src/libjin/Audio/SDL/je_sdl_source.h +++ b/src/libjin/Audio/SDL/je_sdl_source.h @@ -1,5 +1,5 @@ -#ifndef __JE_SOURCE_SDL_H -#define __JE_SOURCE_SDL_H +#ifndef __JE_SOURCE_SDL_H__ +#define __JE_SOURCE_SDL_H__ #include "../../core/je_configuration.h" #if defined(jin_audio) && (jin_audio == jin_audio_sdl) @@ -269,4 +269,4 @@ namespace JinEngine #endif // (jin_audio) && (jin_audio == jin_audio_sdl) -#endif // __JE_SOURCE_SDL_H
\ No newline at end of file +#endif // __JE_SOURCE_SDL_H__
\ No newline at end of file diff --git a/src/libjin/Audio/je_audio_manager.h b/src/libjin/Audio/je_audio_manager.h index 00b531a..120d38e 100644 --- a/src/libjin/Audio/je_audio_manager.h +++ b/src/libjin/Audio/je_audio_manager.h @@ -1,5 +1,5 @@ -#ifndef __JE_AUDIO_H -#define __JE_AUDIO_H +#ifndef __JE_AUDIO_H__ +#define __JE_AUDIO_H__ #include "../core/je_configuration.h" #if defined(jin_audio) @@ -84,4 +84,4 @@ namespace JinEngine #endif // jin_audio -#endif // __JE_AUDIO_H
\ No newline at end of file +#endif // __JE_AUDIO_H__
\ No newline at end of file diff --git a/src/libjin/Audio/je_source.h b/src/libjin/Audio/je_source.h index 519d39f..f60daf9 100644 --- a/src/libjin/Audio/je_source.h +++ b/src/libjin/Audio/je_source.h @@ -1,5 +1,5 @@ -#ifndef __JE_AUDIO_SOURCE_H -#define __JE_AUDIO_SOURCE_H +#ifndef __JE_AUDIO_SOURCE_H__ +#define __JE_AUDIO_SOURCE_H__ #include "../core/je_configuration.h" #if defined(jin_audio) @@ -113,4 +113,4 @@ namespace JinEngine #endif // jin_audio -#endif // __JE_AUDIO_SOURCE_H
\ No newline at end of file +#endif // __JE_AUDIO_SOURCE_H__
\ No newline at end of file diff --git a/src/libjin/Common/je_array.hpp b/src/libjin/Common/je_array.hpp index 361f1f0..8a5cbf1 100644 --- a/src/libjin/Common/je_array.hpp +++ b/src/libjin/Common/je_array.hpp @@ -1,5 +1,5 @@ -#ifndef __JE_COMMON_ARRAY_H -#define __JE_COMMON_ARRAY_H +#ifndef __JE_COMMON_ARRAY_H__ +#define __JE_COMMON_ARRAY_H__ namespace JinEngine { diff --git a/src/libjin/Common/je_common.h b/src/libjin/Common/je_common.h index 0dfa79a..67505c1 100644 --- a/src/libjin/Common/je_common.h +++ b/src/libjin/Common/je_common.h @@ -1,5 +1,5 @@ -#ifndef __JE_COMMON_H -#define __JE_COMMON_H +#ifndef __JE_COMMON_H__ +#define __JE_COMMON_H__ #include "je_array.hpp" diff --git a/src/libjin/Common/je_exception.h b/src/libjin/Common/je_exception.h index 19fdedb..cf11f51 100644 --- a/src/libjin/Common/je_exception.h +++ b/src/libjin/Common/je_exception.h @@ -1,5 +1,5 @@ -#ifndef __JE_EXCEPTION_H -#define __JE_EXCEPTION_H +#ifndef __JE_EXCEPTION_H__ +#define __JE_EXCEPTION_H__ #include <exception> diff --git a/src/libjin/Common/je_noncopyable.h b/src/libjin/Common/je_noncopyable.h index 89a3e68..eff7121 100644 --- a/src/libjin/Common/je_noncopyable.h +++ b/src/libjin/Common/je_noncopyable.h @@ -1,5 +1,5 @@ -#ifndef __JE_NONCOPYABLE_H -#define __JE_NONCOPYABLE_H +#ifndef __JE_NONCOPYABLE_H__ +#define __JE_NONCOPYABLE_H__ namespace JinEngine { diff --git a/src/libjin/Common/je_object.h b/src/libjin/Common/je_object.h index 0d3e848..1afbf67 100644 --- a/src/libjin/Common/je_object.h +++ b/src/libjin/Common/je_object.h @@ -1,5 +1,5 @@ -#ifndef __JE_OBJECT_H -#define __JE_OBJECT_H +#ifndef __JE_OBJECT_H__ +#define __JE_OBJECT_H__ namespace JinEngine { diff --git a/src/libjin/Common/je_pool.hpp b/src/libjin/Common/je_pool.hpp index 1107fd5..1c74eaf 100644 --- a/src/libjin/Common/je_pool.hpp +++ b/src/libjin/Common/je_pool.hpp @@ -1,5 +1,5 @@ -#ifndef __JE_POOL_H -#define __JE_POOL_H +#ifndef __JE_POOL_H__ +#define __JE_POOL_H__ namespace JinEngine { diff --git a/src/libjin/Common/je_singleton.hpp b/src/libjin/Common/je_singleton.hpp index e981e7a..d7f52c9 100644 --- a/src/libjin/Common/je_singleton.hpp +++ b/src/libjin/Common/je_singleton.hpp @@ -1,5 +1,5 @@ -#ifndef __JE_SINGLETON_H -#define __JE_SINGLETON_H +#ifndef __JE_SINGLETON_H__ +#define __JE_SINGLETON_H__ namespace JinEngine { @@ -77,4 +77,4 @@ namespace JinEngine } // namespace JinEngine -#endif // __JE_SINGLETON_H
\ No newline at end of file +#endif // __JE_SINGLETON_H__ diff --git a/src/libjin/Common/je_stringmap.hpp b/src/libjin/Common/je_stringmap.hpp index 43e3e9b..7a3bd80 100644 --- a/src/libjin/Common/je_stringmap.hpp +++ b/src/libjin/Common/je_stringmap.hpp @@ -1,5 +1,5 @@ -#ifndef __JE_COMMON_SREINGMAP_H -#define __JE_COMMON_SREINGMAP_H +#ifndef __JE_COMMON_SREINGMAP_H__ +#define __JE_COMMON_SREINGMAP_H__ namespace JinEngine { diff --git a/src/libjin/Common/je_subsystem.hpp b/src/libjin/Common/je_subsystem.hpp index d8e106d..c015bef 100644 --- a/src/libjin/Common/je_subsystem.hpp +++ b/src/libjin/Common/je_subsystem.hpp @@ -1,5 +1,5 @@ -#ifndef __JE_COMMON_SUBSYSTEM_H -#define __JE_COMMON_SUBSYSTEM_H +#ifndef __JE_COMMON_SUBSYSTEM_H__ +#define __JE_COMMON_SUBSYSTEM_H__ #include "../utils/je_macros.h" diff --git a/src/libjin/Common/je_temporary.h b/src/libjin/Common/je_temporary.h index 9a127da..647bfba 100644 --- a/src/libjin/Common/je_temporary.h +++ b/src/libjin/Common/je_temporary.h @@ -1,5 +1,5 @@ -#ifndef __JE_TEMPORARY_H -#define __JE_TEMPORARY_H +#ifndef __JE_TEMPORARY_H__ +#define __JE_TEMPORARY_H__ namespace JinEngine { diff --git a/src/libjin/Common/je_types.h b/src/libjin/Common/je_types.h index 446c413..448d7ac 100644 --- a/src/libjin/Common/je_types.h +++ b/src/libjin/Common/je_types.h @@ -1,5 +1,5 @@ -#ifndef __JE_TYPES_H -#define __JE_TYPES_H +#ifndef __JE_TYPES_H__ +#define __JE_TYPES_H__ #include <stdint.h> namespace JinEngine diff --git a/src/libjin/Common/je_utf8.h b/src/libjin/Common/je_utf8.h index a11850c..d840b75 100644 --- a/src/libjin/Common/je_utf8.h +++ b/src/libjin/Common/je_utf8.h @@ -1,5 +1,5 @@ -#ifndef __JE_COMMON_UTF8_H -#define __JE_COMMON_UTF8_H +#ifndef __JE_COMMON_UTF8_H__ +#define __JE_COMMON_UTF8_H__ #include "../core/je_configuration.h" #if jin_os == jin_os_windows @@ -31,4 +31,4 @@ namespace JinEngine #endif // jin_os == jin_os_windows -#endif // __JE_COMMON_UTF8_H
\ No newline at end of file +#endif // __JE_COMMON_UTF8_H__ diff --git a/src/libjin/Core/je_configuration.h b/src/libjin/Core/je_configuration.h index 065fbae..3ef52c8 100644 --- a/src/libjin/Core/je_configuration.h +++ b/src/libjin/Core/je_configuration.h @@ -1,5 +1,5 @@ -#ifndef __JE_COMMON_MODULES_H -#define __JE_COMMON_MODULES_H +#ifndef __JE_COMMON_MODULES_H__ +#define __JE_COMMON_MODULES_H__ #define jin_undefined 0x00 @@ -53,4 +53,4 @@ #define jin_ai -#endif // __JE_COMMON_MODULES_H
\ No newline at end of file +#endif // __JE_COMMON_MODULES_H__
\ No newline at end of file diff --git a/src/libjin/Core/je_version.h b/src/libjin/Core/je_version.h index 77302c6..b5fe379 100644 --- a/src/libjin/Core/je_version.h +++ b/src/libjin/Core/je_version.h @@ -1,5 +1,5 @@ -#ifndef __JE_CORE_VERSION_H -#define __JE_CORE_VERSION_H +#ifndef __JE_CORE_VERSION_H__ +#define __JE_CORE_VERSION_H__ namespace JinEngine { @@ -49,4 +49,4 @@ namespace JinEngine } // namespace Core } // namespace JinEngine -#endif // __JE_CORE_VERSION_H
\ No newline at end of file +#endif // __JE_CORE_VERSION_H__ diff --git a/src/libjin/Filesystem/je_asset_database.h b/src/libjin/Filesystem/je_asset_database.h index c85b378..e61aebf 100644 --- a/src/libjin/Filesystem/je_asset_database.h +++ b/src/libjin/Filesystem/je_asset_database.h @@ -1,5 +1,5 @@ -#ifndef __JE_ASSET_DATABASE_H -#define __JE_ASSET_DATABASE_H +#ifndef __JE_ASSET_DATABASE_H__ +#define __JE_ASSET_DATABASE_H__ #include "../core/je_configuration.h" #if defined(jin_filesystem) diff --git a/src/libjin/Filesystem/je_buffer.h b/src/libjin/Filesystem/je_buffer.h index 0726e1d..1111e49 100644 --- a/src/libjin/Filesystem/je_buffer.h +++ b/src/libjin/Filesystem/je_buffer.h @@ -1,5 +1,5 @@ -#ifndef __JE_BUFFER_H -#define __JE_BUFFER_H +#ifndef __JE_BUFFER_H__ +#define __JE_BUFFER_H__ #include "../core/je_configuration.h" #if defined(jin_filesystem) diff --git a/src/libjin/Game/je_application.h b/src/libjin/Game/je_application.h index f740c22..094de6a 100644 --- a/src/libjin/Game/je_application.h +++ b/src/libjin/Game/je_application.h @@ -1,5 +1,5 @@ -#ifndef __JE_CORE_GAME_H -#define __JE_CORE_GAME_H +#ifndef __JE_CORE_GAME_H__ +#define __JE_CORE_GAME_H__ #include "../core/je_configuration.h" #if defined(jin_game) @@ -85,4 +85,4 @@ namespace JinEngine #endif // jin_game -#endif // __JE_CORE_GAME_H
\ No newline at end of file +#endif // __JE_CORE_GAME_H__
\ No newline at end of file diff --git a/src/libjin/Game/je_entity.h b/src/libjin/Game/je_entity.h index 92976b4..39822b6 100644 --- a/src/libjin/Game/je_entity.h +++ b/src/libjin/Game/je_entity.h @@ -1,5 +1,5 @@ -#ifndef __JE_ENTITY_H -#define __JE_ENTITY_H +#ifndef __JE_ENTITY_H__ +#define __JE_ENTITY_H__ #include "je_gameobject.h" diff --git a/src/libjin/Game/je_gameobject.h b/src/libjin/Game/je_gameobject.h index 08a103f..fefc6df 100644 --- a/src/libjin/Game/je_gameobject.h +++ b/src/libjin/Game/je_gameobject.h @@ -1,5 +1,5 @@ -#ifndef __JE_GAME_OBJECT_H -#define __JE_GAME_OBJECT_H +#ifndef __JE_GAME_OBJECT_H__ +#define __JE_GAME_OBJECT_H__ #include "../core/je_configuration.h" #if defined(jin_game) diff --git a/src/libjin/Game/je_scene.h b/src/libjin/Game/je_scene.h index 6100166..811d1a8 100644 --- a/src/libjin/Game/je_scene.h +++ b/src/libjin/Game/je_scene.h @@ -1,5 +1,5 @@ -#ifndef __JE_GAME_SCENE_H -#define __JE_GAME_SCENE_H +#ifndef __JE_GAME_SCENE_H__ +#define __JE_GAME_SCENE_H__ #include "../core/je_configuration.h" #if defined(jin_game) diff --git a/src/libjin/Graphics/animations/je_animation.h b/src/libjin/Graphics/animations/je_animation.h index f694455..3f9d008 100644 --- a/src/libjin/Graphics/animations/je_animation.h +++ b/src/libjin/Graphics/animations/je_animation.h @@ -1,5 +1,5 @@ -#ifndef __JE_ANIMATION_H -#define __JE_ANIMATION_H +#ifndef __JE_ANIMATION_H__ +#define __JE_ANIMATION_H__ #include <vector> #include <string> diff --git a/src/libjin/Graphics/animations/je_animator.h b/src/libjin/Graphics/animations/je_animator.h index 9273ff8..84b0385 100644 --- a/src/libjin/Graphics/animations/je_animator.h +++ b/src/libjin/Graphics/animations/je_animator.h @@ -1,5 +1,5 @@ -#ifndef __JE_ANIMATOR_H -#define __JE_ANIMATOR_H +#ifndef __JE_ANIMATOR_H__ +#define __JE_ANIMATOR_H__ #include <map> #include <vector> diff --git a/src/libjin/Graphics/fonts/je_decoder.h b/src/libjin/Graphics/fonts/je_decoder.h index cacbad8..840cada 100644 --- a/src/libjin/Graphics/fonts/je_decoder.h +++ b/src/libjin/Graphics/fonts/je_decoder.h @@ -1,5 +1,5 @@ -#ifndef __JE_UTF8_H -#define __JE_UTF8_H +#ifndef __JE_UTF8_H__ +#define __JE_UTF8_H__ #include <vector> diff --git a/src/libjin/Graphics/fonts/je_font.h b/src/libjin/Graphics/fonts/je_font.h index ae151dc..9581b9f 100644 --- a/src/libjin/Graphics/fonts/je_font.h +++ b/src/libjin/Graphics/fonts/je_font.h @@ -1,5 +1,5 @@ -#ifndef __JE_FONT_H -#define __JE_FONT_H +#ifndef __JE_FONT_H__ +#define __JE_FONT_H__ #include <vector> #include "je_text.h" @@ -106,4 +106,4 @@ namespace JinEngine } // namespace Graphics } // namespace JinEngine -#endif // __JE_FONT_H
\ No newline at end of file +#endif // __JE_FONT_H__ diff --git a/src/libjin/Graphics/fonts/je_page.h b/src/libjin/Graphics/fonts/je_page.h index cc61ac2..707f53a 100644 --- a/src/libjin/Graphics/fonts/je_page.h +++ b/src/libjin/Graphics/fonts/je_page.h @@ -1,5 +1,5 @@ -#ifndef __JE_PAGE_H -#define __JE_PAGE_H +#ifndef __JE_PAGE_H__ +#define __JE_PAGE_H__ #include "../../math/je_vector2.hpp" @@ -51,4 +51,4 @@ namespace JinEngine } // namespace Graphics } // namespace JinEngine -#endif // __JE_PAGE_H
\ No newline at end of file +#endif // __JE_PAGE_H__ diff --git a/src/libjin/Graphics/fonts/je_text.h b/src/libjin/Graphics/fonts/je_text.h index 261f112..6e6f8b0 100644 --- a/src/libjin/Graphics/fonts/je_text.h +++ b/src/libjin/Graphics/fonts/je_text.h @@ -1,5 +1,5 @@ -#ifndef __JE_TEXT_H -#define __JE_TEXT_H +#ifndef __JE_TEXT_H__ +#define __JE_TEXT_H__ #include <vector> diff --git a/src/libjin/Graphics/fonts/je_texture_font.h b/src/libjin/Graphics/fonts/je_texture_font.h index 13abbae..df8f956 100644 --- a/src/libjin/Graphics/fonts/je_texture_font.h +++ b/src/libjin/Graphics/fonts/je_texture_font.h @@ -1,5 +1,5 @@ -#ifndef __JE_TEXTURE_FONT_H -#define __JE_TEXTURE_FONT_H +#ifndef __JE_TEXTURE_FONT_H__ +#define __JE_TEXTURE_FONT_H__ #include <map> #include <vector> diff --git a/src/libjin/Graphics/fonts/je_ttf.h b/src/libjin/Graphics/fonts/je_ttf.h index 02017ec..28260f6 100644 --- a/src/libjin/Graphics/fonts/je_ttf.h +++ b/src/libjin/Graphics/fonts/je_ttf.h @@ -1,5 +1,5 @@ -#ifndef __JETTF_H -#define __JE_TTF_H +#ifndef __JE_TTF_H__ +#define __JE_TTF_H__ #include "../../core/je_configuration.h" #if defined(jin_graphics) @@ -289,4 +289,4 @@ namespace JinEngine #endif // defined(jin_graphics) -#endif // __JE_FONT_H
\ No newline at end of file +#endif // __JE_FONT_H__ diff --git a/src/libjin/Graphics/je_bitmap.h b/src/libjin/Graphics/je_bitmap.h index 9d10106..bb7bbfa 100644 --- a/src/libjin/Graphics/je_bitmap.h +++ b/src/libjin/Graphics/je_bitmap.h @@ -1,5 +1,5 @@ -#ifndef __JE_BITMAP_H -#define __JE_BITMAP_H +#ifndef __JE_BITMAP_H__ +#define __JE_BITMAP_H__ #include "../core/je_configuration.h" #if defined(jin_graphics) diff --git a/src/libjin/Graphics/je_canvas.h b/src/libjin/Graphics/je_canvas.h index f39b0de..952c25f 100644 --- a/src/libjin/Graphics/je_canvas.h +++ b/src/libjin/Graphics/je_canvas.h @@ -1,5 +1,5 @@ -#ifndef __JE_CANVAS_H -#define __JE_CANVAS_H +#ifndef __JE_CANVAS_H__ +#define __JE_CANVAS_H__ #include "../core/je_configuration.h" #if defined(jin_graphics) @@ -65,4 +65,4 @@ namespace JinEngine #endif // defined(jin_graphics) -#endif // __JE_CANVAS_H
\ No newline at end of file +#endif // __JE_CANVAS_H__
\ No newline at end of file diff --git a/src/libjin/Graphics/je_color.h b/src/libjin/Graphics/je_color.h index 10d2818..9195e48 100644 --- a/src/libjin/Graphics/je_color.h +++ b/src/libjin/Graphics/je_color.h @@ -1,8 +1,8 @@ /** * Some color operating here. */ -#ifndef __JE_COLOR_H -#define __JE_COLOR_H +#ifndef __JE_COLOR_H__ +#define __JE_COLOR_H__ #include "../core/je_configuration.h" #if defined(jin_graphics) @@ -111,4 +111,4 @@ namespace JinEngine #endif // jin_graphics -#endif // __JE_COLOR_H
\ No newline at end of file +#endif // __JE_COLOR_H__
\ No newline at end of file diff --git a/src/libjin/Graphics/je_gl.h b/src/libjin/Graphics/je_gl.h index f1e7a2b..6309db6 100644 --- a/src/libjin/Graphics/je_gl.h +++ b/src/libjin/Graphics/je_gl.h @@ -1,5 +1,5 @@ -#ifndef __JE_OPENGL_H -#define __JE_OPENGL_H +#ifndef __JE_OPENGL_H__ +#define __JE_OPENGL_H__ #include "GLee/GLee.h" #include "ogl/OpenGL.h" @@ -38,4 +38,4 @@ namespace JinEngine } // namespace Graphics } // namespace JinEngine -#endif // __JE_OPENGL_H
\ No newline at end of file +#endif // __JE_OPENGL_H__
\ No newline at end of file diff --git a/src/libjin/Graphics/je_graphic.h b/src/libjin/Graphics/je_graphic.h index 69fa109..fdc328d 100644 --- a/src/libjin/Graphics/je_graphic.h +++ b/src/libjin/Graphics/je_graphic.h @@ -1,5 +1,5 @@ -#ifndef __JE_GRAPHIC_H -#define __JE_GRAPHIC_H +#ifndef __JE_GRAPHIC_H__ +#define __JE_GRAPHIC_H__ #include "../core/je_configuration.h" #if defined(jin_graphics) @@ -80,4 +80,4 @@ namespace JinEngine #endif // defined(jin_graphics) -#endif // __JE_GRAPHIC_H
\ No newline at end of file +#endif // __JE_GRAPHIC_H__
\ No newline at end of file diff --git a/src/libjin/Graphics/je_graphics.h b/src/libjin/Graphics/je_graphics.h index bef72c0..46d2a23 100644 --- a/src/libjin/Graphics/je_graphics.h +++ b/src/libjin/Graphics/je_graphics.h @@ -1,5 +1,5 @@ -#ifndef __JE_GRAPHICS_H -#define __JE_GRAPHICS_H +#ifndef __JE_GRAPHICS_H__ +#define __JE_GRAPHICS_H__ #include "../core/je_configuration.h" #if defined(jin_graphics) @@ -20,4 +20,4 @@ #include "particles/je_particle_system.h" #endif // defined(jin_graphics) -#endif // __JE_GRAPHICS_H
\ No newline at end of file +#endif // __JE_GRAPHICS_H__
\ No newline at end of file diff --git a/src/libjin/Graphics/je_image.h b/src/libjin/Graphics/je_image.h index 04ee4d2..15baed3 100644 --- a/src/libjin/Graphics/je_image.h +++ b/src/libjin/Graphics/je_image.h @@ -1,5 +1,5 @@ -#ifndef __JE_IMAGE_H -#define __JE_IMAGE_H +#ifndef __JE_IMAGE_H__ +#define __JE_IMAGE_H__ #include "je_bitmap.h" diff --git a/src/libjin/Graphics/je_mesh.h b/src/libjin/Graphics/je_mesh.h index ed22d91..f5680ee 100644 --- a/src/libjin/Graphics/je_mesh.h +++ b/src/libjin/Graphics/je_mesh.h @@ -1,5 +1,5 @@ -#ifndef __JE_MESH_H -#define __JE_MESH_H +#ifndef __JE_MESH_H__ +#define __JE_MESH_H__ namespace JinEngine { diff --git a/src/libjin/Graphics/je_shapes.h b/src/libjin/Graphics/je_shapes.h index 2221526..16e29a4 100644 --- a/src/libjin/Graphics/je_shapes.h +++ b/src/libjin/Graphics/je_shapes.h @@ -1,5 +1,5 @@ -#ifndef __JE_GEOMETRY_H -#define __JE_GEOMETRY_H +#ifndef __JE_GEOMETRY_H__ +#define __JE_GEOMETRY_H__ #include "../core/je_configuration.h" #if defined(jin_graphics) @@ -31,4 +31,4 @@ namespace JinEngine #endif // jin_graphics -#endif // __JE_GEOMETRY_H
\ No newline at end of file +#endif // __JE_GEOMETRY_H__ diff --git a/src/libjin/Graphics/je_sprite.h b/src/libjin/Graphics/je_sprite.h index 6e6812a..a361be7 100644 --- a/src/libjin/Graphics/je_sprite.h +++ b/src/libjin/Graphics/je_sprite.h @@ -1,5 +1,5 @@ -#ifndef __JE_SPRITE_H -#define __JE_SPRITE_H +#ifndef __JE_SPRITE_H__ +#define __JE_SPRITE_H__ #include "../common/je_types.h" #include "../math/je_vector2.hpp" diff --git a/src/libjin/Graphics/je_sprite_sheet.h b/src/libjin/Graphics/je_sprite_sheet.h index 29f3a0e..76bd022 100644 --- a/src/libjin/Graphics/je_sprite_sheet.h +++ b/src/libjin/Graphics/je_sprite_sheet.h @@ -1,5 +1,5 @@ -#ifndef __JE_SPRITE_SHEET_H -#define __JE_SPRITE_SHEET_H +#ifndef __JE_SPRITE_SHEET_H__ +#define __JE_SPRITE_SHEET_H__ #include <vector> diff --git a/src/libjin/Graphics/je_texture.h b/src/libjin/Graphics/je_texture.h index e47ad58..0ab682d 100644 --- a/src/libjin/Graphics/je_texture.h +++ b/src/libjin/Graphics/je_texture.h @@ -1,5 +1,5 @@ -#ifndef __JE_TEXTURE_H -#define __JE_TEXTURE_H +#ifndef __JE_TEXTURE_H__ +#define __JE_TEXTURE_H__ #include "../core/je_configuration.h" #if defined(jin_graphics) @@ -53,4 +53,4 @@ namespace JinEngine #endif // jin_graphics -#endif // __JE_TEXTURE_H
\ No newline at end of file +#endif // __JE_TEXTURE_H__
\ No newline at end of file diff --git a/src/libjin/Graphics/particles/je_particle.h b/src/libjin/Graphics/particles/je_particle.h index 819b95c..3dd480e 100644 --- a/src/libjin/Graphics/particles/je_particle.h +++ b/src/libjin/Graphics/particles/je_particle.h @@ -1,5 +1,5 @@ -#ifndef __JE_PARTICLE_H -#define __JE_PARTICLE_H +#ifndef __JE_PARTICLE_H__ +#define __JE_PARTICLE_H__ #include "../../math/je_vector2.hpp" diff --git a/src/libjin/Graphics/particles/je_particle_emitter.cpp b/src/libjin/Graphics/particles/je_particle_emitter.cpp index 0ab9cf1..36ae16f 100644 --- a/src/libjin/Graphics/particles/je_particle_emitter.cpp +++ b/src/libjin/Graphics/particles/je_particle_emitter.cpp @@ -1,5 +1,5 @@ -#ifndef __JE_PARTICLE_SYSTEM_H -#define __JE_PARTICLE_SYSTEM_H +#ifndef __JE_PARTICLE_SYSTEM_H__ +#define __JE_PARTICLE_SYSTEM_H__ namespace JinEngine { diff --git a/src/libjin/Graphics/particles/je_particle_emitter.h b/src/libjin/Graphics/particles/je_particle_emitter.h index c6e4321..5ffbdf2 100644 --- a/src/libjin/Graphics/particles/je_particle_emitter.h +++ b/src/libjin/Graphics/particles/je_particle_emitter.h @@ -1,5 +1,5 @@ -#ifndef __JE_PARTICLE_EMITTER_H -#define __JE_PARTICLE_EMITTER_H +#ifndef __JE_PARTICLE_EMITTER_H__ +#define __JE_PARTICLE_EMITTER_H__ #include "../../common/je_temporary.h" #include "../../math/je_vector2.hpp" diff --git a/src/libjin/Graphics/particles/je_particle_pool.h b/src/libjin/Graphics/particles/je_particle_pool.h index 9bc7d78..6bd41e0 100644 --- a/src/libjin/Graphics/particles/je_particle_pool.h +++ b/src/libjin/Graphics/particles/je_particle_pool.h @@ -1,5 +1,5 @@ -#ifndef __JE_PARTICLE_BATCH_H -#define __JE_PARTICLE_BATCH_H +#ifndef __JE_PARTICLE_BATCH_H__ +#define __JE_PARTICLE_BATCH_H__ #include <list> diff --git a/src/libjin/Graphics/particles/je_particle_system.h b/src/libjin/Graphics/particles/je_particle_system.h index aa7ff99..32123a6 100644 --- a/src/libjin/Graphics/particles/je_particle_system.h +++ b/src/libjin/Graphics/particles/je_particle_system.h @@ -1,5 +1,5 @@ -#ifndef __JE_PARTICLE_EMMITTER_H -#define __JE_PARTICLE_EMMITTER_H +#ifndef __JE_PARTICLE_EMMITTER_H__ +#define __JE_PARTICLE_EMMITTER_H__ #include <vector> diff --git a/src/libjin/Graphics/shaders/je_base.shader.h b/src/libjin/Graphics/shaders/je_base.shader.h index d6f9d7b..e5ca2c3 100644 --- a/src/libjin/Graphics/shaders/je_base.shader.h +++ b/src/libjin/Graphics/shaders/je_base.shader.h @@ -1,5 +1,5 @@ -#ifndef __JE_BASE_SHADER_H -#define __JE_BASE_SHADER_H +#ifndef __JE_BASE_SHADER_H__ +#define __JE_BASE_SHADER_H__ static const char* base_shared = R"( #define Number float @@ -85,4 +85,4 @@ static const char* SHADER_MAIN_TEXTURE = "jin_MainTexture"; static const char* SHADER_VERTEX_COORDS = "jin_VertexCoords"; static const char* SHADER_TEXTURE_COORDS = "jin_TextureCoords"; -#endif // __JE_BASE_SHADER_H
\ No newline at end of file +#endif // __JE_BASE_SHADER_H__ diff --git a/src/libjin/Graphics/shaders/je_jsl_compiler.h b/src/libjin/Graphics/shaders/je_jsl_compiler.h index eeb42ae..df1e827 100644 --- a/src/libjin/Graphics/shaders/je_jsl_compiler.h +++ b/src/libjin/Graphics/shaders/je_jsl_compiler.h @@ -1,5 +1,5 @@ -#ifndef __JE_JSL_COMPILER_H -#define __JE_JSL_COMPILER_H +#ifndef __JE_JSL_COMPILER_H__ +#define __JE_JSL_COMPILER_H__ #include "../../core/je_configuration.h" #if defined(jin_graphics) && (jin_graphics & jin_graphics_shader) @@ -42,4 +42,4 @@ namespace JinEngine #endif // (jin_graphics) && (jin_graphics & jin_graphics_shader) -#endif // __JE_JSL_COMPILER_H
\ No newline at end of file +#endif // __JE_JSL_COMPILER_H__ diff --git a/src/libjin/Graphics/shaders/je_shader.h b/src/libjin/Graphics/shaders/je_shader.h index 3a4f65b..09cda51 100644 --- a/src/libjin/Graphics/shaders/je_shader.h +++ b/src/libjin/Graphics/shaders/je_shader.h @@ -1,5 +1,5 @@ -#ifndef __JE_SHADER_H -#define __JE_SHADER_H +#ifndef __JE_SHADER_H__ +#define __JE_SHADER_H__ #include "../../core/je_configuration.h" #if defined(jin_graphics) && (jin_graphics & jin_graphics_shader) @@ -197,4 +197,4 @@ namespace JinEngine #endif // (jin_graphics) && (jin_graphics & jin_graphics_shader) -#endif // __JE_SHADER_H
\ No newline at end of file +#endif // __JE_SHADER_H__
\ No newline at end of file diff --git a/src/libjin/Input/je_event.h b/src/libjin/Input/je_event.h index 126d0f6..9fe34ff 100644 --- a/src/libjin/Input/je_event.h +++ b/src/libjin/Input/je_event.h @@ -1,5 +1,5 @@ -#ifndef __JE_EVENT_H -#define __JE_EVENT_H +#ifndef __JE_EVENT_H__ +#define __JE_EVENT_H__ #include "../core/je_configuration.h" #if defined(jin_input) @@ -118,4 +118,4 @@ namespace JinEngine #endif // defined(jin_input) -#endif // __JE_EVENT_H
\ No newline at end of file +#endif // __JE_EVENT_H__ diff --git a/src/libjin/Input/je_input.h b/src/libjin/Input/je_input.h index 8c7faf7..2abee0a 100644 --- a/src/libjin/Input/je_input.h +++ b/src/libjin/Input/je_input.h @@ -1,5 +1,5 @@ -#ifndef __JE_INPUT_H -#define __JE_INPUT_H +#ifndef __JE_INPUT_H__ +#define __JE_INPUT_H__ #include "je_event.h" #include "je_keyboard.h" diff --git a/src/libjin/Input/je_joypad.h b/src/libjin/Input/je_joypad.h index 74173af..fb5dc38 100644 --- a/src/libjin/Input/je_joypad.h +++ b/src/libjin/Input/je_joypad.h @@ -1,5 +1,5 @@ -#ifndef __JE_JOYPAD_H -#define __JE_JOYPAD_H +#ifndef __JE_JOYPAD_H__ +#define __JE_JOYPAD_H__ #include <SDL2/SDL.h> @@ -53,4 +53,4 @@ namespace JinEngine } // namespace Input } // namespace JinEngine -#endif // __JE_JOYPAD_H
\ No newline at end of file +#endif // __JE_JOYPAD_H__ diff --git a/src/libjin/Input/je_keyboard.h b/src/libjin/Input/je_keyboard.h index 61da361..25cfd5d 100644 --- a/src/libjin/Input/je_keyboard.h +++ b/src/libjin/Input/je_keyboard.h @@ -1,5 +1,5 @@ -#ifndef __JE_KEYBOARD_H -#define __JE_KEYBOARD_H +#ifndef __JE_KEYBOARD_H__ +#define __JE_KEYBOARD_H__ namespace JinEngine { @@ -17,4 +17,4 @@ namespace JinEngine } // namespace Input } // namespace JinEngine -#endif // __JE_KEYBOARD_H
\ No newline at end of file +#endif // __JE_KEYBOARD_H__ diff --git a/src/libjin/Input/je_mouse.h b/src/libjin/Input/je_mouse.h index 29038ec..3c4ad9b 100644 --- a/src/libjin/Input/je_mouse.h +++ b/src/libjin/Input/je_mouse.h @@ -1,5 +1,5 @@ -#ifndef __JE_MOUSE_H -#define __JE_MOUSE_H +#ifndef __JE_MOUSE_H__ +#define __JE_MOUSE_H__ #include "../core/je_configuration.h" #if defined(jin_input) @@ -46,4 +46,4 @@ namespace JinEngine #endif // defined(jin_input) -#endif // __JE_MOUSE_H
\ No newline at end of file +#endif // __JE_MOUSE_H__ diff --git a/src/libjin/Math/je_constant.h b/src/libjin/Math/je_constant.h index 5ab126c..45577e7 100644 --- a/src/libjin/Math/je_constant.h +++ b/src/libjin/Math/je_constant.h @@ -1,5 +1,5 @@ -#ifndef __JE_MATH_CONSTANT_H -#define __JE_MATH_CONSTANT_H +#ifndef __JE_MATH_CONSTANT_H__ +#define __JE_MATH_CONSTANT_H__ #define PI 3.1415926f diff --git a/src/libjin/Math/je_math.h b/src/libjin/Math/je_math.h index 6a05c44..de57e36 100644 --- a/src/libjin/Math/je_math.h +++ b/src/libjin/Math/je_math.h @@ -1,5 +1,5 @@ -#ifndef __JE_UTILS_MATH_H -#define __JE_UTILS_MATH_H +#ifndef __JE_UTILS_MATH_H__ +#define __JE_UTILS_MATH_H__ #include "je_constant.h" #include "je_matrix.h" @@ -80,4 +80,4 @@ namespace JinEngine } // namespace Math } // namespace JinEngine -#endif // __JE_UTILS_MATH_H
\ No newline at end of file +#endif // __JE_UTILS_MATH_H__ diff --git a/src/libjin/Math/je_matrix.h b/src/libjin/Math/je_matrix.h index 3592d18..bbc831d 100644 --- a/src/libjin/Math/je_matrix.h +++ b/src/libjin/Math/je_matrix.h @@ -1,5 +1,5 @@ -#ifndef __JE_MATRIX_H -#define __JE_MATRIX_H +#ifndef __JE_MATRIX_H__ +#define __JE_MATRIX_H__ namespace JinEngine { @@ -156,4 +156,4 @@ namespace JinEngine } // namespace Math } // namespace JinEngine -#endif // __JE_MATRIX_H
\ No newline at end of file +#endif // __JE_MATRIX_H__ diff --git a/src/libjin/Math/je_quad.h b/src/libjin/Math/je_quad.h index 2a66fa1..8a7bd64 100644 --- a/src/libjin/Math/je_quad.h +++ b/src/libjin/Math/je_quad.h @@ -1,5 +1,5 @@ -#ifndef __JE_QUAD_H -#define __JE_QUAD_H +#ifndef __JE_QUAD_H__ +#define __JE_QUAD_H__ namespace JinEngine { @@ -20,4 +20,4 @@ namespace JinEngine } // namespace Math } // namespace JinEngine -#endif // __JE_QUAD_H
\ No newline at end of file +#endif // __JE_QUAD_H__ diff --git a/src/libjin/Math/je_random.h b/src/libjin/Math/je_random.h index eb59341..ff58918 100644 --- a/src/libjin/Math/je_random.h +++ b/src/libjin/Math/je_random.h @@ -1,5 +1,5 @@ -#ifndef __JE_RANDOM_H -#define __JE_RANDOM_H +#ifndef __JE_RANDOM_H__ +#define __JE_RANDOM_H__ namespace JinEngine { diff --git a/src/libjin/Math/je_vector2.hpp b/src/libjin/Math/je_vector2.hpp index a2b3371..c55ae03 100644 --- a/src/libjin/Math/je_vector2.hpp +++ b/src/libjin/Math/je_vector2.hpp @@ -1,5 +1,5 @@ -#ifndef __JE_VECTOR_H -#define __JE_VECTOR_H +#ifndef __JE_VECTOR_H__ +#define __JE_VECTOR_H__ namespace JinEngine { diff --git a/src/libjin/Math/je_vector3.hpp b/src/libjin/Math/je_vector3.hpp index 0f9448d..fdab2d0 100644 --- a/src/libjin/Math/je_vector3.hpp +++ b/src/libjin/Math/je_vector3.hpp @@ -1,5 +1,5 @@ -#ifndef __JE_VECTOR3_H -#define __JE_VECTOR3_H +#ifndef __JE_VECTOR3_H__ +#define __JE_VECTOR3_H__ namespace JinEngine { diff --git a/src/libjin/Math/je_vector4.hpp b/src/libjin/Math/je_vector4.hpp index 20353eb..5cd5b35 100644 --- a/src/libjin/Math/je_vector4.hpp +++ b/src/libjin/Math/je_vector4.hpp @@ -1,5 +1,5 @@ -#ifndef __JE_VECTOR4_H -#define __JE_VECTOR4_H +#ifndef __JE_VECTOR4_H__ +#define __JE_VECTOR4_H__ namespace JinEngine { diff --git a/src/libjin/Net/je_net_manager.h b/src/libjin/Net/je_net_manager.h index 8f72b73..62aa947 100644 --- a/src/libjin/Net/je_net_manager.h +++ b/src/libjin/Net/je_net_manager.h @@ -1,5 +1,5 @@ -#ifndef __JE_NET_H -#define __JE_NET_H +#ifndef __JE_NET_H__ +#define __JE_NET_H__ #include "../core/je_configuration.h" #if defined(jin_net) @@ -47,4 +47,4 @@ namespace JinEngine #endif // defined(jin_net) -#endif // __JE_NET_H
\ No newline at end of file +#endif // __JE_NET_H__ diff --git a/src/libjin/Net/je_socket.h b/src/libjin/Net/je_socket.h index df2a2bf..eb01719 100644 --- a/src/libjin/Net/je_socket.h +++ b/src/libjin/Net/je_socket.h @@ -1,5 +1,5 @@ -#ifndef __JE_NET_SOCKET_H -#define __JE_NET_SOCKET_H +#ifndef __JE_NET_SOCKET_H__ +#define __JE_NET_SOCKET_H__ #include "../core/je_configuration.h" #if defined(jin_net) @@ -141,4 +141,4 @@ namespace JinEngine #endif // defined(jin_net) -#endif // __JE_NET_SOCKET_H
\ No newline at end of file +#endif // __JE_NET_SOCKET_H__
\ No newline at end of file diff --git a/src/libjin/Time/je_timer.h b/src/libjin/Time/je_timer.h index b6b4b9e..b558a55 100644 --- a/src/libjin/Time/je_timer.h +++ b/src/libjin/Time/je_timer.h @@ -1,5 +1,5 @@ -#ifndef __JE_TIMER_H -#define __JE_TIMER_H +#ifndef __JE_TIMER_H__ +#define __JE_TIMER_H__ #include "../core/je_configuration.h" #if defined(jin_time) @@ -114,4 +114,4 @@ namespace JinEngine #endif // defined(jin_time) -#endif // __JE_TIMER_H
\ No newline at end of file +#endif // __JE_TIMER_H__ diff --git a/src/libjin/Utils/je_log.h b/src/libjin/Utils/je_log.h index 21ffd93..f81bbae 100644 --- a/src/libjin/Utils/je_log.h +++ b/src/libjin/Utils/je_log.h @@ -1,5 +1,5 @@ -#ifndef __LOG_HELPER_H -#define __LOG_HELPER_H +#ifndef __LOG_H__ELPER_H__ +#define __LOG_H__ELPER_H__ #include <string> #include <iostream> @@ -60,4 +60,4 @@ typedef Loghelper::Level Loglevel; #define jin_log_debug(f, ...) #endif -#endif // __LOG_HELPER_H
\ No newline at end of file +#endif // __LOG_H__ELPER_H__
\ No newline at end of file diff --git a/src/libjin/Utils/je_macros.h b/src/libjin/Utils/je_macros.h index 475a482..6e4e7a9 100644 --- a/src/libjin/Utils/je_macros.h +++ b/src/libjin/Utils/je_macros.h @@ -1,5 +1,5 @@ -#ifndef __JE_MACROS_H -#define __JE_MACROS_H +#ifndef __JE_MACROS_H__ +#define __JE_MACROS_H__ #include <cstring> //#define implement // ʵֽӿ diff --git a/src/libjin/Utils/je_utils.h b/src/libjin/Utils/je_utils.h index 21c507d..a77c126 100644 --- a/src/libjin/Utils/je_utils.h +++ b/src/libjin/Utils/je_utils.h @@ -1,5 +1,5 @@ -#ifndef __JE_UTILS_H -#define __JE_UTILS_H +#ifndef __JE_UTILS_H__ +#define __JE_UTILS_H__ #include "je_macros.h" #include "je_endian.h" diff --git a/src/libjin/ai/je_ai.h b/src/libjin/ai/je_ai.h index 74c4fd1..be1d622 100644 --- a/src/libjin/ai/je_ai.h +++ b/src/libjin/ai/je_ai.h @@ -1,5 +1,5 @@ -#ifndef __JE_AI_H -#define __JE_AI_H +#ifndef __JE_AI_H__ +#define __JE_AI_H__ #include "je_state_machine.h" #include "je_behavior_tree.h" diff --git a/src/libjin/ai/je_behavior_tree.h b/src/libjin/ai/je_behavior_tree.h index 6c7c25f..cb518f0 100644 --- a/src/libjin/ai/je_behavior_tree.h +++ b/src/libjin/ai/je_behavior_tree.h @@ -1,5 +1,5 @@ -#ifndef __JE_BEHAVIOR_TREE_H -#define __JE_BEHAVIOR_TREE_H +#ifndef __JE_BEHAVIOR_TREE_H__ +#define __JE_BEHAVIOR_TREE_H__ #include "../core/je_configuration.h" #if defined(jin_ai) diff --git a/src/libjin/ai/je_state_machine.cpp b/src/libjin/ai/je_state_machine.cpp index 987dbce..8f8bd81 100644 --- a/src/libjin/ai/je_state_machine.cpp +++ b/src/libjin/ai/je_state_machine.cpp @@ -469,6 +469,5 @@ namespace JinEngine mTraslateCallback = callback; } - } // namespace AI } // namespace JinEngine
\ No newline at end of file diff --git a/src/libjin/ai/je_state_machine.h b/src/libjin/ai/je_state_machine.h index ba3a318..7d638c4 100644 --- a/src/libjin/ai/je_state_machine.h +++ b/src/libjin/ai/je_state_machine.h @@ -1,5 +1,5 @@ -#ifndef __JE_STATE_MACHINE_H -#define __JE_STATE_MACHINE_H +#ifndef __JE_STATE_MACHINE_H__ +#define __JE_STATE_MACHINE_H__ #include "../core/je_configuration.h" #if defined(jin_ai) diff --git a/src/libjin/jin.h b/src/libjin/jin.h index a8c00b5..064f928 100644 --- a/src/libjin/jin.h +++ b/src/libjin/jin.h @@ -1,5 +1,5 @@ -#ifndef __JE_H -#define __JE_H +#ifndef __JE_H__ +#define __JE_H__ #include "core/je_configuration.h" @@ -18,4 +18,4 @@ #include "common/je_common.h" #include "ai/je_ai.h" -#endif // __JE_H
\ No newline at end of file +#endif // __JE_H__
\ No newline at end of file diff --git a/src/libjin/multithread/je_thread.h b/src/libjin/multithread/je_thread.h index 353690c..ec3684a 100644 --- a/src/libjin/multithread/je_thread.h +++ b/src/libjin/multithread/je_thread.h @@ -1,5 +1,5 @@ -#ifndef __JE_THREAD_H -#define __JE_THREAD_H +#ifndef __JE_THREAD_H__ +#define __JE_THREAD_H__ #include "../core/je_configuration.h" #if defined(jin_thread) @@ -164,4 +164,4 @@ namespace JinEngine #endif // defined(jin_thread) -#endif // __JE_THREAD_H
\ No newline at end of file +#endif // __JE_THREAD_H__
\ No newline at end of file |