Skip to content

Commit

Permalink
feat: #38 Format tab code
Browse files Browse the repository at this point in the history
  • Loading branch information
@ducphamhong
ducphamhong committed Jan 5, 2020
1 parent ddfde1e commit 8b67dc0
Show file tree
Hide file tree
Showing 14 changed files with 114 additions and 113 deletions.
26 changes: 13 additions & 13 deletions Projects/Skylicht/Client/Source/BuildConfig/CBuildConfig.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,24 +32,24 @@ namespace Skylicht
class CBuildConfig
{
public:
static std::string SaveFolder;
static std::string ProfileFolder;
static std::string MountFolder;
static std::string DataFolder;
static std::string SaveFolder;
static std::string ProfileFolder;
static std::string MountFolder;
static std::string DataFolder;

static std::string DeviceID;
static std::string OSVersion;
static std::string Factory;
static std::string Model;
static std::string DeviceID;
static std::string OSVersion;
static std::string Factory;
static std::string Model;

static std::string CPID;
static std::string CPID;

static std::string APKPath;
static std::string ObbPath;
static std::string APKPath;
static std::string ObbPath;

static std::string BundleID;
static std::string BundleID;

static std::string DLCVersion;
static std::string DLCVersion;

static bool UseZipData;
};
Expand Down
24 changes: 12 additions & 12 deletions Projects/Skylicht/Client/Source/CApplication.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,22 +34,22 @@ namespace Skylicht
public CBaseApp
{
public:
unsigned long m_lastUpdateTime;
int m_fps;
unsigned long m_lastUpdateTime;
int m_fps;

unsigned long m_pauseTime;
unsigned long m_pauseTime;

protected:
bool m_resizeWin;
bool m_resizeWin;

protected:
int m_width;
int m_height;
int m_width;
int m_height;

bool m_runGame;
bool m_showFPS;
bool m_runGame;
bool m_showFPS;

std::vector<std::string> m_argv;
std::vector<std::string> m_argv;

public:
CApplication();
Expand Down Expand Up @@ -85,9 +85,9 @@ namespace Skylicht

// updateTouch
// action:
// + 0: TouchDown
// + 1: TouchUp
// + 2: TouchMove
// + 0: TouchDown
// + 1: TouchUp
// + 2: TouchMove
void updateTouch(long touchID, int x, int y, int action);

// updateJoystick
Expand Down
18 changes: 9 additions & 9 deletions Projects/Skylicht/Client/Source/CBaseApp.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,19 +44,19 @@ namespace Skylicht
class CBaseApp
{
protected:
IrrlichtDevice* m_device;
IVideoDriver* m_driver;
io::IFileSystem* m_fileSystem;
IrrlichtDevice* m_device;
IVideoDriver* m_driver;
io::IFileSystem* m_fileSystem;

SExposedVideoData m_videoData;
SExposedVideoData m_videoData;

float m_timeStep;
int m_limitFPS;
float m_timeStep;
int m_limitFPS;

float m_clearScreenTime;
bool m_enableRender;
float m_clearScreenTime;
bool m_enableRender;

video::SColor m_clearColor;
video::SColor m_clearColor;
public:

CBaseApp();
Expand Down
12 changes: 6 additions & 6 deletions Projects/Skylicht/Engine/Source/Camera/CEditorCamera.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,19 +33,19 @@ namespace Skylicht
public IEventReceiver
{
protected:
f32 m_moveSpeed;
f32 m_moveSpeed;
f32 m_rotateSpeed;
gui::ICursorControl *m_cursorControl;

core::position2df m_centerCursor;
core::position2df m_cursorPos;

bool m_leftMousePress;
bool m_rightMousePress;
bool m_midMousePress;
bool m_leftMousePress;
bool m_rightMousePress;
bool m_midMousePress;

bool m_mouseWhell;
float m_wheel;
bool m_mouseWhell;
float m_wheel;

public:
CEditorCamera();
Expand Down
16 changes: 8 additions & 8 deletions Projects/Skylicht/Engine/Source/GameObject/CContainerObject.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,18 +31,18 @@ namespace Skylicht
class CContainerObject : public CGameObject
{
protected:
ArrayGameObject m_childs;
ArrayGameObject m_add;
ArrayGameObject m_remove;
ArrayGameObject m_childs;
ArrayGameObject m_add;
ArrayGameObject m_remove;

core::array<CGameObject*> m_arrayChildObjects;
core::array<CGameObject*> m_arrayChildObjects;

core::array<CGameObject*> m_objectsAffectLight;
core::array<CContainerObject*> m_childContainer;
core::array<CGameObject*> m_objectsAffectLight;
core::array<CContainerObject*> m_childContainer;

core::map<std::wstring, CGameObject*> m_objectByName;
core::map<std::wstring, CGameObject*> m_objectByName;

bool m_updateRemoveAdd;
bool m_updateRemoveAdd;
public:
CContainerObject(CGameObject *parent, CZone *zone);

Expand Down
46 changes: 23 additions & 23 deletions Projects/Skylicht/Engine/Source/GameObject/CGameObject.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,32 +39,32 @@ namespace Skylicht
class CGameObject
{
public:
static long s_objectID;
static std::map<long, long> s_mapObjIDOnFileSaved;
static bool s_repairIDMode;
static long s_objectID;
static std::map<long, long> s_mapObjIDOnFileSaved;
static bool s_repairIDMode;

protected:
long m_objectID;
std::wstring m_name;
std::wstring m_defaultName;
std::string m_namec;
long m_objectID;
std::wstring m_name;
std::wstring m_defaultName;
std::string m_namec;

bool m_static;
bool m_enable;
bool m_visible;
bool m_lighting;
bool m_static;
bool m_enable;
bool m_visible;
bool m_lighting;

bool m_lockObject;
bool m_lockObject;

CEntity *m_entity;
CGameObject *m_parent;
CZone *m_zone;
CEntity *m_entity;
CGameObject *m_parent;
CZone *m_zone;

void *m_tagData;
int m_tagDataInt;
std::string m_tagDataString;
void *m_tagData;
int m_tagDataInt;
std::string m_tagDataString;

CShaderParams m_shaderParams;
CShaderParams m_shaderParams;

std::vector<CComponentSystem*> m_components;
public:
Expand Down Expand Up @@ -242,12 +242,12 @@ namespace Skylicht
};

// typedef for array object
typedef std::vector<CGameObject*> ArrayGameObject;
typedef std::vector<CGameObject*>::iterator ArrayGameObjectIter;
typedef std::vector<CGameObject*> ArrayGameObject;
typedef std::vector<CGameObject*>::iterator ArrayGameObjectIter;

// typedef for array component system
typedef std::vector<CComponentSystem*> ArrayComponent;
typedef std::vector<CComponentSystem*>::iterator ArrayComponentIter;
typedef std::vector<CComponentSystem*> ArrayComponent;
typedef std::vector<CComponentSystem*>::iterator ArrayComponentIter;

template<class T>
T* CGameObject::addComponent()
Expand Down
6 changes: 3 additions & 3 deletions Projects/Skylicht/Engine/Source/GameObject/CZone.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ namespace Skylicht
class CZone : public CContainerObject
{
protected:
CEntityManager *m_entityManager;
CEntityManager *m_entityManager;

public:
CZone(CEntityManager *entityManager);
Expand All @@ -50,6 +50,6 @@ namespace Skylicht
}
};

typedef std::vector<CZone*> ArrayZone;
typedef std::vector<CZone*>::iterator ArrayZoneIter;
typedef std::vector<CZone*> ArrayZone;
typedef std::vector<CZone*>::iterator ArrayZoneIter;
}
46 changes: 23 additions & 23 deletions Projects/Skylicht/Engine/Source/Graphics2D/CGraphics2D.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,44 +43,44 @@ namespace Skylicht
};

protected:
core::matrix4 m_orthoMatrix;
core::matrix4 m_orthoMatrix;

video::SMaterial m_2dMaterial;
video::SMaterial m_2dMaterialFont;
video::SMaterial m_2dMaterialImage;
video::SMaterial m_2dMaterial;
video::SMaterial m_2dMaterialFont;
video::SMaterial m_2dMaterialImage;

int m_currentW;
int m_currentH;

core::matrix4 m_prjMatrix;
core::matrix4 m_viewMatrix;
core::matrix4 m_prjMatrix;
core::matrix4 m_viewMatrix;

IVideoDriver* m_driver;
IVideoDriver *m_driver;

IMeshBuffer *m_buffer;
scene::SVertexBuffer* m_vertices;
scene::CIndexBuffer* m_indices;
IMeshBuffer *m_buffer;
scene::SVertexBuffer *m_vertices;
scene::CIndexBuffer *m_indices;

IMeshBuffer *m_bufferFont;
scene::SVertexBuffer* m_verticesFont;
scene::CIndexBuffer* m_indicesFont;
IMeshBuffer *m_bufferFont;
scene::SVertexBuffer *m_verticesFont;
scene::CIndexBuffer *m_indicesFont;

IMeshBuffer *m_bufferImage;
scene::SVertexBuffer* m_verticesImage;
scene::CIndexBuffer* m_indicesImage;
IMeshBuffer *m_bufferImage;
scene::SVertexBuffer *m_verticesImage;
scene::CIndexBuffer *m_indicesImage;

bool m_isDrawMask;
bool m_isMaskTest;
bool m_isDrawMask;
bool m_isMaskTest;

int m_numFlushTime;
int m_numFlushTime;

float m_scaleRatio;
float m_scaleRatio;

EDrawState m_drawState;

int m_vertexColorShader;
int m_textureColorShader;
int m_textureColorAlphaMaskShader;
int m_vertexColorShader;
int m_textureColorShader;
int m_textureColorAlphaMaskShader;

public:
CGraphics2D();
Expand Down
4 changes: 2 additions & 2 deletions Projects/Skylicht/Engine/Source/Importer/Collada/CColladaLoader.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ namespace Skylicht
std::wstring name;
std::wstring fileName;
};
typedef std::vector<SColladaImage> ArrayImages;
typedef std::vector<SColladaImage> ArrayImages;

struct SEffectParam
{
Expand Down Expand Up @@ -244,7 +244,7 @@ namespace Skylicht

struct SColladaVertexIndex
{
s32 vertexId;
s32 vertexId;
s32 normalId;
s32 texcoordId1;
s32 texcoordId2;
Expand Down
6 changes: 3 additions & 3 deletions Projects/Skylicht/Engine/Source/RenderMesh/CMesh.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,10 @@ namespace Skylicht

static void applyDoubleSided(IMeshBuffer *buffer);

core::array<IMeshBuffer*> MeshBuffers;
core::array<IMeshBuffer*> MeshBuffers;

core::aabbox3d<f32> BoundingBox;
core::aabbox3d<f32> BoundingBox;

std::vector<std::string> MaterialName;
std::vector<std::string> MaterialName;
};
}
12 changes: 6 additions & 6 deletions Projects/Skylicht/Engine/Source/TextureManager/CTextureManager.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,15 @@ namespace Skylicht
protected:
struct STexturePackage
{
std::string package;
ITexture *texture;
std::string package;
ITexture *texture;
};

std::string m_currentPackage;
std::vector<STexturePackage*> m_textureList;
std::string m_currentPackage;
std::vector<STexturePackage*> m_textureList;

std::vector<std::string> m_listCommonTexture;
int m_loadCommonPos;
std::vector<std::string> m_listCommonTexture;
int m_loadCommonPos;

public:
CTextureManager();
Expand Down
4 changes: 2 additions & 2 deletions Projects/Skylicht/System/Source/Thread/CPThread.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@ namespace SkylichtSystem
class CPThread : public IThread
{
protected:
pthread_t m_pthread;
pthread_t m_pthread;

bool m_run;
bool m_run;
public:
CPThread(IThreadCallback *callback);
virtual ~CPThread();
Expand Down
2 changes: 1 addition & 1 deletion Projects/Skylicht/System/Source/Thread/CPThreadMutex.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ namespace SkylichtSystem
class CPThreadMutex : public IMutex
{
protected:
pthread_mutex_t m_mutex;
pthread_mutex_t m_mutex;

public:
CPThreadMutex();
Expand Down
Loading

0 comments on commit 8b67dc0

Please sign in to comment.