remove begin_code and end_code

This commit is contained in:
Kirigaya Kazuto 2017-07-31 00:18:10 +08:00
parent af41d54a4a
commit 2f027b7925
62 changed files with 240 additions and 126 deletions

View File

@ -1,5 +1,6 @@
#include "Audio.h"
#include "begin_code.h"
namespace MiniEngine
{
AudioPlayer::AudioPlayer()
{
if (!_sysAudioCounter)
@ -30,4 +31,5 @@ AudioPlayer::_Audio::~_Audio()
AudioPlayer::_Audio* AudioPlayer::_sysAudio = nullptr;
int AudioPlayer::_sysAudioCounter = 0;
#include "end_code.h"
} /// End of namespace MiniEngine

View File

@ -1,6 +1,7 @@
#pragma once
#include "include.h"
#include "begin_code.h"
namespace MiniEngine
{
class AudioPlayer
{
public:
@ -17,4 +18,5 @@ private:
static _Audio* _sysAudio;
static int _sysAudioCounter;
};
#include "end_code.h"
} /// End of namespace MiniEngine

View File

@ -1,5 +1,6 @@
#include "ColorMode.h"
#include "begin_code.h"
namespace MiniEngine
{
ColorMode::ColorMode(int R, int G, int B)
{
r = R;
@ -11,4 +12,5 @@ ColorMode::ColorMode()
{
r = g = b = 0;
}
#include "end_code.h"
} /// End of namespace MiniEngine

View File

@ -1,6 +1,7 @@
#pragma once
#include "include.h"
#include "begin_code.h"
namespace MiniEngine
{
class ColorMode
{
public:
@ -8,4 +9,5 @@ public:
ColorMode(int R, int G, int B);
ColorMode();
};
#include "end_code.h"
} /// End of namespace MiniEngine

View File

@ -1,6 +1,7 @@
#include "Cursor.h"
#include "_caster.h"
#include "begin_code.h"
namespace MiniEngine
{
//private
void Cursor::_set(SDL_Cursor* p)
{
@ -75,4 +76,5 @@ void Cursor::activate()
SDL_SetCursor(_get());
}
}
#include "end_code.h"
} /// End of namespace MiniEngine

View File

@ -6,7 +6,8 @@
#include "Point.h"
#include "Surface.h"
#include "__Plugin.h"
#include "begin_code.h"
namespace MiniEngine
{
class Cursor : public NonCopyable
{
public:
@ -33,4 +34,5 @@ private:
friend class _internal::Plugin;
};
#include "end_code.h"
} /// End of namespace MiniEngine

View File

@ -1,6 +1,7 @@
#include "ErrorViewer.h"
#include "include.h"
#include "begin_code.h"
namespace MiniEngine
{
void ErrorViewer::fetch()
{
str = SDL_GetError();
@ -15,4 +16,5 @@ const char * ErrorViewer::what() const noexcept
{
return str.c_str();
}
#include "end_code.h"
} /// End of namespace MiniEngine

View File

@ -1,7 +1,8 @@
#pragma once
#include <exception>
#include <string>
#include "begin_code.h"
namespace MiniEngine
{
class ErrorViewer : public std::exception
{
public:
@ -11,4 +12,5 @@ public:
private:
std::string str;
};
#include "end_code.h"
} /// End of namespace MiniEngine

View File

@ -1,6 +1,7 @@
#include "Font.h"
#include "_caster.h"
#include "begin_code.h"
namespace MiniEngine
{
// private
void Font::_set(TTF_Font* p)
{
@ -399,4 +400,5 @@ void Font::release()
{
_clear();
}
#include "end_code.h"
} /// End of namespace MiniEngine

View File

@ -8,7 +8,8 @@
#include "Renderer.h"
#include <vector>
#include "__Plugin.h"
#include "begin_code.h"
namespace MiniEngine
{
class Font
{
public:
@ -122,4 +123,5 @@ private:
friend class _internal::Plugin;
};
#include "end_code.h"
} /// End of namespace MiniEngine

View File

@ -1,5 +1,6 @@
#include "Log.h"
#include "begin_code.h"
namespace MiniEngine
{
void LogSystem::d(const char* fmt,...)
{
va_list ap;
@ -47,4 +48,5 @@ void LogSystem::critical(const char* fmt,...)
SDL_LogMessageV(SDL_LOG_CATEGORY_APPLICATION,SDL_LOG_PRIORITY_CRITICAL,fmt,ap);
va_end(ap);
}
#include "end_code.h"
} /// End of namespace MiniEngine

View File

@ -1,6 +1,7 @@
#pragma once
#include "include.h"
#include "begin_code.h"
namespace MiniEngine
{
class LogSystem
{
static void v(const char* fmt,...);/// Verbose
@ -10,4 +11,5 @@ class LogSystem
static void e(const char* fmt,...);/// Error
static void critical(const char* fmt,...);/// Critical
};
#include "end_code.h"
} /// End of namespace MiniEngine

View File

@ -1,5 +1,6 @@
#include "MessageBox.h"
#include "begin_code.h"
namespace MiniEngine
{
WindowMessageBoxButton::WindowMessageBoxButton()
{
_hitoption=0;
@ -63,4 +64,5 @@ const WindowMessageBoxButton& WindowMessageBox::getButtonConst(int index) const
{
return _vec.at(index);
}
#include "end_code.h"
} /// End of namespace MiniEngine

View File

@ -4,7 +4,8 @@
#include <string>
#include <functional>
#include <vector>
#include "begin_code.h"
namespace MiniEngine
{
class WindowMessageBoxButton
{
public:
@ -42,4 +43,5 @@ public:
private:
std::vector<WindowMessageBoxButton> _vec;
};
#include "end_code.h"
} /// End of namespace MiniEngine

View File

@ -1,6 +1,7 @@
#include "Music.h"
#include "_caster.h"
#include "begin_code.h"
namespace MiniEngine
{
//private
void Music::_set(Mix_Music* p)
{
@ -126,4 +127,5 @@ int MusicPlayer::setPosition(double second)
return Mix_SetMusicPosition(second);
}
#include "end_code.h"
} /// End of namespace MiniEngine

View File

@ -8,7 +8,8 @@
#include "_MusicType.h"
#include "__Noncopyable.h"
#include "__Plugin.h"
#include "begin_code.h"
namespace MiniEngine
{
/// Forward Declaration
class Music
{
@ -54,4 +55,5 @@ private:
};
#include "end_code.h"
} /// End of namespace MiniEngine

View File

@ -1,5 +1,6 @@
#include "Point.h"
#include "begin_code.h"
namespace MiniEngine
{
Point::Point(int X, int Y)
{
@ -27,4 +28,5 @@ bool Point::inRect(const Rect& rect) const
return ( SDL_PointInRect(&p, &r) == SDL_TRUE );
}
#include "end_code.h"
} /// End of namespace MiniEngine

View File

@ -1,7 +1,8 @@
#pragma once
#include "include.h"
#include "Rect.h"
#include "begin_code.h"
namespace MiniEngine
{
class Point
{
public:
@ -11,4 +12,5 @@ public:
SDL_Point toSDLPoint() const;
bool inRect(const Rect& rect) const;
};
#include "end_code.h"
} /// End of namespace MiniEngine

View File

@ -1,5 +1,6 @@
#include "RGBA.h"
#include "begin_code.h"
namespace MiniEngine
{
RGBA::RGBA(int R, int G, int B, int A)
{
r = R;
@ -35,4 +36,5 @@ ColorMode RGBA::toColorMode() const
{
return ColorMode(r, g, b);
}
#include "end_code.h"
} /// End of namespace MiniEngine

View File

@ -1,7 +1,8 @@
#pragma once
#include "include.h"
#include "ColorMode.h"
#include "begin_code.h"
namespace MiniEngine
{
class RGBA
{
@ -14,4 +15,5 @@ public:
ColorMode toColorMode() const;
};
#include "end_code.h"
} /// End of namespace MiniEngine

View File

@ -1,5 +1,6 @@
#include "RWOP.h"
#include "begin_code.h"
namespace MiniEngine
{
// private
void RWOP::_set(SDL_RWops* p)
{
@ -45,4 +46,5 @@ void RWOP::release()
{
_clear();
}
#include "end_code.h"
} /// End of namespace MiniEngine

View File

@ -4,7 +4,8 @@
#include <string>
#include <memory>
#include "__Plugin.h"
#include "begin_code.h"
namespace MiniEngine
{
class RWOP
{
public:
@ -28,4 +29,5 @@ private:
friend class _internal::Plugin;
};
#include "end_code.h"
} /// End of namespace MiniEngine

View File

@ -1,6 +1,7 @@
#include "Rect.h"
#include "begin_code.h"
namespace MiniEngine
{
Rect::Rect(int X, int Y, int W, int H)
{
@ -69,4 +70,5 @@ Rect Rect::getUnion(const Rect& r) const
return Rect(c);
}
#include "end_code.h"
} /// End of namespace MiniEngine

View File

@ -1,7 +1,8 @@
#pragma once
#include "include.h"
#include "begin_code.h"
namespace MiniEngine
{
class Rect
{
@ -18,4 +19,5 @@ public:
Rect getUnion(const Rect&) const;
};
#include "end_code.h"
} /// End of namespace MiniEngine

View File

@ -1,6 +1,7 @@
#include "Renderer.h"
#include "_caster.h"
#include "begin_code.h"
namespace MiniEngine
{
//private
void Renderer::_set(SDL_Renderer* p)
@ -516,4 +517,5 @@ int Renderer::GetDriversNum()
return SDL_GetNumRenderDrivers();
}
#include "end_code.h"
} /// End of namespace MiniEngine

View File

@ -7,7 +7,8 @@
#include "Texture.h"
#include "__Plugin.h"
#include <initializer_list>
#include "begin_code.h"
namespace MiniEngine
{
class Renderer
{
public:
@ -149,4 +150,5 @@ private:
friend class _internal::Plugin;
};
#include "end_code.h"
} /// End of namespace MiniEngine

View File

@ -1,6 +1,7 @@
#include "SDLSystem.h"
#include "_caster.h"
#include "begin_code.h"
namespace MiniEngine
{
// private
void SDLSystem::_init(Uint32 sdl_flag, Uint32 img_flag, Uint32 mix_flag, bool init_ttf)
{
@ -300,4 +301,5 @@ bool SDLSystem::HasClipboardText()
return SDL_HasClipboardText()==SDL_TRUE;
}
#include "end_code.h"
} /// End of namespace MiniEngine

View File

@ -10,7 +10,8 @@
#include "ErrorViewer.h"
#include <tuple>
#include <string>
#include "begin_code.h"
namespace MiniEngine
{
class SDLSystem : public NonCopyable, public NonMoveable
{
@ -73,4 +74,5 @@ private:
void _init(Uint32,Uint32,Uint32,bool);
void _quit();
};
#include "end_code.h"
} /// End of namespace MiniEngine

View File

@ -1,5 +1,6 @@
#include "SharedLibrary.h"
#include "begin_code.h"
namespace MiniEngine
{
//private
void* SharedLibrary::_get() const
{
@ -64,4 +65,5 @@ void SharedLibrary::release()
{
_clear();
}
#include "end_code.h"
} /// End of namespace MiniEngine

View File

@ -3,7 +3,8 @@
#include <string>
#include <memory>
#include <functional>
#include "begin_code.h"
namespace MiniEngine
{
class SharedLibrary
{
public:
@ -27,4 +28,5 @@ private:
void _clear();
std::shared_ptr<void> _obj;
};
#include "end_code.h"
} /// End of namespace MiniEngine

View File

@ -1,5 +1,6 @@
#include "Sound.h"
#include "begin_code.h"
namespace MiniEngine
{
//private
void Sound::_set(Mix_Chunk* p)
{
@ -170,4 +171,5 @@ Channel SoundPlayer::fadeIn(Sound sound, int loops, int ms)
c.fadeIn(sound,loops,ms);
return c;
}
#include "end_code.h"
} /// End of namespace MiniEngine

View File

@ -6,7 +6,8 @@
#include "ErrorViewer.h"
#include "RWOP.h"
#include "__Plugin.h"
#include "begin_code.h"
namespace MiniEngine
{
class Sound
{
public:
@ -67,4 +68,5 @@ public:
Channel playSound(Sound sound, int loops);
Channel fadeIn(Sound sound, int loops, int ms);
};
#include "end_code.h"
} /// End of namespace MiniEngine

View File

@ -1,6 +1,7 @@
#include "Surface.h"
#include "_caster.h"
#include "begin_code.h"
namespace MiniEngine
{
//private
void Surface::_set(SDL_Surface* p)
{
@ -356,4 +357,5 @@ SDL_Surface* Surface::getRawPointer()
{
return _get();
}
#include "end_code.h"
} /// End of namespace MiniEngine

View File

@ -6,7 +6,8 @@
#include "RWOP.h"
#include "ErrorViewer.h"
#include "__Plugin.h"
#include "begin_code.h"
namespace MiniEngine
{
class Surface
{
public:
@ -86,4 +87,5 @@ private:
friend class _internal::Plugin;
};
#include "end_code.h"
} /// End of namespace MiniEngine

View File

@ -1,6 +1,7 @@
#include "Texture.h"
#include "_caster.h"
#include "begin_code.h"
namespace MiniEngine
{
//private
void Texture::_set(SDL_Texture* p)
{
@ -123,4 +124,5 @@ void Texture::release()
{
_clear();
}
#include "end_code.h"
} /// End of namespace MiniEngine

View File

@ -6,7 +6,8 @@
#include "_BlendMode.h"
#include "__Plugin.h"
#include <memory>
#include "begin_code.h"
namespace MiniEngine
{
class Texture
{
@ -45,4 +46,5 @@ private:
friend class _internal::Plugin;
};
#include "end_code.h"
} /// End of namespace MiniEngine

View File

@ -1,5 +1,6 @@
#include "Timer.h"
#include "begin_code.h"
namespace MiniEngine
{
/// Global Executor For class Timer
Uint32 _global_timer_executor(Uint32 interval,void* param)
{
@ -84,4 +85,5 @@ void Timer::_delete_delegator(std::function<Uint32(Uint32)>* param)
{
delete param;
}
#include "end_code.h"
} /// End of namespace MiniEngine

View File

@ -1,7 +1,8 @@
#pragma once
#include "include.h"
#include <functional>
#include "begin_code.h"
namespace MiniEngine
{
Uint32 _global_timer_executor(Uint32 interval,void* param);
class Timer
@ -48,4 +49,5 @@ private:
/// Reserved Variable For Template variable Parameter
bool _delete_on_disable;
};
#include "end_code.h"
} /// End of namespace MiniEngine

View File

@ -1,6 +1,7 @@
#include "Window.h"
#include "_caster.h"
#include "begin_code.h"
namespace MiniEngine
{
//private
void Window::_set(SDL_Window* p)
{
@ -247,4 +248,5 @@ bool Window::isScreenKeyboardShown()
{
return SDL_IsScreenKeyboardShown(_get())==SDL_TRUE;
}
#include "end_code.h"
} /// End of namespace MiniEngine

View File

@ -6,7 +6,8 @@
#include "MessageBox.h"
#include "Surface.h"
#include "__Plugin.h"
#include "begin_code.h"
namespace MiniEngine
{
class Window
{
public:
@ -65,4 +66,5 @@ private:
friend class Renderer;
friend class _internal::Plugin;
};
#include "end_code.h"
} /// End of namespace MiniEngine

View File

@ -1,5 +1,6 @@
#pragma once
#include "begin_code.h"
namespace MiniEngine
{
enum class BlendMode
{
None,
@ -7,4 +8,5 @@ enum class BlendMode
Add,
Mod
};
#include "end_code.h"
} /// End of namespace MiniEngine

View File

@ -1,9 +1,11 @@
#pragma once
#include "begin_code.h"
namespace MiniEngine
{
enum class FlipMode
{
None,
Horizontal,
Vertical
};
#include "end_code.h"
} /// End of namespace MiniEngine

View File

@ -1,5 +1,6 @@
#pragma once
#include "begin_code.h"
namespace MiniEngine
{
enum class FontHint
{
Normal,
@ -8,4 +9,5 @@ enum class FontHint
None,
Error
};
#include "end_code.h"
} /// End of namespace MiniEngine

View File

@ -1,5 +1,6 @@
#pragma once
#include "begin_code.h"
namespace MiniEngine
{
enum class FontStyle
{
Normal,
@ -8,4 +9,5 @@ enum class FontStyle
UnderLine,
StrikeThrough
};
#include "end_code.h"
} /// End of namespace MiniEngine

View File

@ -1,5 +1,6 @@
#pragma once
#include "begin_code.h"
namespace MiniEngine
{
enum class IMGInitFlag
{
JPG,
@ -8,4 +9,5 @@ enum class IMGInitFlag
WEBP,
ALL
};
#include "end_code.h"
} /// End of namespace MiniEngine

View File

@ -1,9 +1,11 @@
#pragma once
#include "begin_code.h"
namespace MiniEngine
{
enum class MessageBoxType
{
Error,
Warning,
Information
};
#include "end_code.h"
} /// End of namespace MiniEngine

View File

@ -1,5 +1,6 @@
#pragma once
#include "begin_code.h"
namespace MiniEngine
{
enum class MixInitFlag
{
FLAC,
@ -9,4 +10,5 @@ enum class MixInitFlag
OGG,
FLUIDSYNTH
};
#include "end_code.h"
} /// End of namespace MiniEngine

View File

@ -1,8 +1,10 @@
#pragma once
#include "include.h"
#include "begin_code.h"
namespace MiniEngine
{
enum class MusicType
{
None,CMD,WAV,MOD,MID,OGG,MP3,MP3MAD,FLAC,MODPLUG
};
#include "end_code.h"
} /// End of namespace MiniEngine

View File

@ -1,5 +1,6 @@
#pragma once
#include "begin_code.h"
namespace MiniEngine
{
enum class Platform
{
Unknown,
@ -9,4 +10,5 @@ enum class Platform
iOS,
Android
};
#include "end_code.h"
} /// End of namespace MiniEngine

View File

@ -1,5 +1,6 @@
#pragma once
#include "begin_code.h"
namespace MiniEngine
{
enum class PowerState
{
Unknown,
@ -8,4 +9,5 @@ enum class PowerState
Charging,
Charged
};
#include "end_code.h"
} /// End of namespace MiniEngine

View File

@ -1,5 +1,6 @@
#pragma once
#include "begin_code.h"
namespace MiniEngine
{
enum class RendererType
{
Software,
@ -7,4 +8,5 @@ enum class RendererType
PresentSync,
TargetTexture
};
#include "end_code.h"
} /// End of namespace MiniEngine

View File

@ -1,5 +1,6 @@
#pragma once
#include "begin_code.h"
namespace MiniEngine
{
enum class SDLInitFlag
{
Timer,
@ -11,4 +12,5 @@ enum class SDLInitFlag
Events,
All
};
#include "end_code.h"
} /// End of namespace MiniEngine

View File

@ -1,5 +1,6 @@
#pragma once
#include "begin_code.h"
namespace MiniEngine
{
enum class SystemCursorType
{
Arrow, Ibeam, CrossHair,
@ -7,4 +8,5 @@ enum class SystemCursorType
SizeNWSE, SizeNESW, SizeWE, SizeNS, SizeAll,
No, Hand
};
#include "end_code.h"
} /// End of namespace MiniEngine

View File

@ -1,5 +1,6 @@
#pragma once
#include "begin_code.h"
namespace MiniEngine
{
enum class WindowType
{
FullScreen, OpenGL, Shown, Hidden,
@ -9,4 +10,5 @@ enum class WindowType
MouseCapture, AlwaysOnTop, SkipTaskBar,
Utility, ToolTip, PopUpMenu
};
#include "end_code.h"
} /// End of namespace MiniEngine

View File

@ -1,5 +1,6 @@
#pragma once
#include "begin_code.h"
namespace MiniEngine
{
class NonCopyable
{
protected:
@ -8,4 +9,5 @@ protected:
NonCopyable(const NonCopyable&) = delete;
NonCopyable& operator = (const NonCopyable&) = delete;
};
#include "end_code.h"
} /// End of namespace MiniEngine

View File

@ -1,5 +1,6 @@
#pragma once
#include "begin_code.h"
namespace MiniEngine
{
class NonMoveable
{
public:
@ -8,4 +9,5 @@ public:
NonMoveable(NonMoveable&&) =delete;
NonMoveable& operator = (NonMoveable&&)=delete;
};
#include "end_code.h"
} /// End of namespace MiniEngine

View File

@ -1,10 +1,12 @@
#pragma once
#include <experimental/optional>
#include "begin_code.h"
namespace MiniEngine
{
template<typename T>
using Optional = std::experimental::optional<T>;
using BadOptionalAccess = std::experimental::bad_optional_access;
constexpr std::experimental::nullopt_t NullOpt = std::experimental::nullopt;
#include "end_code.h"
} /// End of namespace MiniEngine

View File

@ -1,5 +1,6 @@
#pragma once
#include "begin_code.h"
namespace MiniEngine
{
namespace _internal
{
@ -33,4 +34,5 @@ public:
};
}
#include "end_code.h"
} /// End of namespace MiniEngine

View File

@ -1,5 +1,6 @@
#include "_caster.h"
#include "begin_code.h"
namespace MiniEngine
{
namespace _internal
{
BlendMode getBlendModeFromSDLBlendMode(SDL_BlendMode mode)
@ -342,4 +343,5 @@ Mix_MusicType getMixMusicTypeFromMusicType(MusicType type)
}/// End of namespace _internal
#include "end_code.h"
} /// End of namespace MiniEngine

View File

@ -10,7 +10,8 @@
#include "_MixInitFlag.h"
#include "_MusicType.h"
#include <vector>
#include "begin_code.h"
namespace MiniEngine
{
namespace _internal
{
BlendMode getBlendModeFromSDLBlendMode(SDL_BlendMode mode);
@ -28,4 +29,5 @@ int getIntFromMixInitFlag(MixInitFlag flag);
MusicType getMusicTypeFromMixMusicType(Mix_MusicType);
Mix_MusicType getMixMusicTypeFromMusicType(MusicType);
}/// End of namespace _internal
#include "end_code.h"
} /// End of namespace MiniEngine

View File

@ -1,3 +0,0 @@
/// Include this file at the beginning of MiniEngine headers and sources.
namespace MiniEngine
{

View File

@ -1,3 +0,0 @@
/// Include this file at the end of MiniEngine headers and sources.
} /// End of namespace MiniEngine
/// NOTICE: If you see an compile error here, there must be some unclosed "{" !