Merge branch 'master' of https://github.com/WagicProject/wagic into wp8

Fixe timer in Qt frontend Fixe ExtraCost compilation (uses boost when not on WP8).
2013-11-17 18:33:52 +01:00
parent a6ba983650 0ef92d154a
commit 2c2edad8e5
20 changed files with 410 additions and 271 deletions
@@ -128,11 +128,11 @@ typedef uint8_t u8;
 typedef uint16_t u16;
 typedef uint32_t u32;
 #define PIXEL_TYPE DWORD
-#define ARGB(a, r, g, b)                ((PIXEL_TYPE)((a) << 24) | ((r) << 16) | ((g) << 8) | (b))
-#define RGBA(r, g, b, a)                ((PIXEL_TYPE)((a) << 24) | ((b) << 16) | ((g) << 8) | (r))
+#define ARGB(a, r, g, b)		((PIXEL_TYPE)((a) << 24) | ((r) << 16) | ((g) << 8) | (b))
+#define RGBA(r, g, b, a)		((PIXEL_TYPE)((a) << 24) | ((b) << 16) | ((g) << 8) | (r))
 #ifndef PSP
-#define TEXTURE_FORMAT                        0
-#endif //PSP
+#define TEXTURE_FORMAT			0
+#endif  //PSP


 #ifndef CONSOLE_CONFIG
@@ -150,7 +150,7 @@ typedef uint32_t u32;
 	#include <GL/glu.h>
 #endif
 #else
-# include <QtOpenGL>
+#include <QtOpenGL>
 #endif

 #if (defined FORCE_GLES)
@@ -164,105 +164,104 @@ typedef uint32_t u32;
 #endif

 #if defined (PSP)
-
-	#ifndef ABGR8888
-	#define ABGR8888
-	#endif
+#ifndef ABGR8888
+#define ABGR8888
+#endif


-	#if defined (ABGR8888)
-		#define PIXEL_TYPE				u32
-		#ifndef ARGB
-		#define ARGB(a, r, g, b)		(PIXEL_TYPE)((a << 24) | (b << 16) | (g << 8) | r)	// macro to assemble pixels in correct format
-		#endif
-		#define MAKE_COLOR(a, c)		(a << 24 | c)
-		#define MASK_ALPHA				0xFF000000							// masks for accessing individual pixels
-		#define MASK_BLUE				0x00FF0000
-		#define MASK_GREEN				0x0000FF00
-		#define MASK_RED				0x000000FF
+#if defined (ABGR8888)
+#ifndef ARGB
+#define ARGB(a, r, g, b)		(PIXEL_TYPE)((a << 24) | (b << 16) | (g << 8) | r)	// macro to assemble pixels in correct format
+#endif
+#define MAKE_COLOR(a, c)		(a << 24 | c)
+#define MASK_ALPHA				0xFF000000							// masks for accessing individual pixels
+#define MASK_BLUE				0x00FF0000
+#define MASK_GREEN				0x0000FF00
+#define MASK_RED				0x000000FF

-		#define PIXEL_SIZE				4
-		#define PIXEL_FORMAT			PSP_DISPLAY_PIXEL_FORMAT_8888
+#define PIXEL_SIZE				4
+#define PIXEL_FORMAT			PSP_DISPLAY_PIXEL_FORMAT_8888

-		#define	BUFFER_FORMAT			GU_PSM_8888
-		#define TEXTURE_FORMAT			GU_PSM_8888
-		#define TEXTURE_COLOR_FORMAT	GU_COLOR_8888
+#define	BUFFER_FORMAT			GU_PSM_8888
+#define TEXTURE_FORMAT			GU_PSM_8888
+#define TEXTURE_COLOR_FORMAT	GU_COLOR_8888


-	#elif defined (ABGR5551)
+#elif defined (ABGR5551)

-		#ifndef ARGB
-		#define ARGB(a, r, g, b)		((r >> 3) | ((g >> 3) << 5) | ((b >> 3) << 10) | ((a >> 7) << 15))
-		#endif
-		#define MAKE_COLOR(a, c)		(((a>>7)<<15) | c)
-		#define MASK_ALPHA				0x8000
-		#define MASK_BLUE				0x7C00
-		#define MASK_GREEN				0x03E0
-		#define MASK_RED				0x001F
-		#define PIXEL_TYPE				u16
-		#define PIXEL_SIZE				2
-		#define PIXEL_FORMAT			PSP_DISPLAY_PIXEL_FORMAT_5551
+#ifndef ARGB
+#define ARGB(a, r, g, b)		((r >> 3) | ((g >> 3) << 5) | ((b >> 3) << 10) | ((a >> 7) << 15))
+#endif
+#define MAKE_COLOR(a, c)		(((a>>7)<<15) | c)
+#define MASK_ALPHA				0x8000
+#define MASK_BLUE				0x7C00
+#define MASK_GREEN				0x03E0
+#define MASK_RED				0x001F
+#define PIXEL_TYPE				u16
+#define PIXEL_SIZE				2
+#define PIXEL_FORMAT			PSP_DISPLAY_PIXEL_FORMAT_5551

-		#define	BUFFER_FORMAT			GU_PSM_8888
-		#define TEXTURE_FORMAT			GU_PSM_5551
-		#define TEXTURE_COLOR_FORMAT	GU_COLOR_5551
+#define	BUFFER_FORMAT			GU_PSM_8888
+#define TEXTURE_FORMAT			GU_PSM_5551
+#define TEXTURE_COLOR_FORMAT	GU_COLOR_5551

-	#elif defined (ABGR4444)
-		#ifndef ARGB
-		#define ARGB(a, r, g, b)		((r >> 4) | ((g >> 4) << 4) | ((b >> 4) << 8) | ((a >> 4) << 12))
-		#endif
-		#define MAKE_COLOR(a, c)		(((a>>4)<<12) | c)
-		#define MASK_ALPHA				0xF000
-		#define MASK_BLUE				0x0F00
-		#define MASK_GREEN				0x00F0
-		#define MASK_RED				0x000F
-		#define PIXEL_TYPE				u16
-		#define PIXEL_SIZE				2
-		#define PIXEL_FORMAT			PSP_DISPLAY_PIXEL_FORMAT_4444
+#elif defined (ABGR4444)
+#ifndef ARGB
+#define ARGB(a, r, g, b)		((r >> 4) | ((g >> 4) << 4) | ((b >> 4) << 8) | ((a >> 4) << 12))
+#endif
+#define MAKE_COLOR(a, c)		(((a>>4)<<12) | c)
+#define MASK_ALPHA				0xF000
+#define MASK_BLUE				0x0F00
+#define MASK_GREEN				0x00F0
+#define MASK_RED				0x000F
+#define PIXEL_TYPE				u16
+#define PIXEL_SIZE				2
+#define PIXEL_FORMAT			PSP_DISPLAY_PIXEL_FORMAT_4444

-		#define	BUFFER_FORMAT			GU_PSM_4444
-		#define TEXTURE_FORMAT			GU_PSM_4444
-		#define TEXTURE_COLOR_FORMAT	GU_COLOR_4444
+#define	BUFFER_FORMAT			GU_PSM_4444
+#define TEXTURE_FORMAT			GU_PSM_4444
+#define TEXTURE_COLOR_FORMAT	GU_COLOR_4444

-	#endif
+#endif

-	#define	FRAME_BUFFER_WIDTH 		512
-	#define FRAME_BUFFER_SIZE		FRAME_BUFFER_WIDTH*SCREEN_HEIGHT*PIXEL_SIZE
+#define	FRAME_BUFFER_WIDTH 		512
+#define FRAME_BUFFER_SIZE		FRAME_BUFFER_WIDTH*SCREEN_HEIGHT*PIXEL_SIZE

-	#define SLICE_SIZE_F			64.0f
-	typedef unsigned int DWORD;
+#define SLICE_SIZE_F			64.0f
+typedef unsigned int DWORD;

-	#define BLEND_ZERO					0x1000
-	#define BLEND_ONE					0x1002
-	#define BLEND_SRC_COLOR				GU_SRC_COLOR
-	#define BLEND_ONE_MINUS_SRC_COLOR	GU_ONE_MINUS_SRC_COLOR
-	#define BLEND_SRC_ALPHA				GU_SRC_ALPHA
-	#define BLEND_ONE_MINUS_SRC_ALPHA	GU_ONE_MINUS_SRC_ALPHA
-	#define BLEND_DST_ALPHA				GU_DST_ALPHA
-	#define BLEND_ONE_MINUS_DST_ALPHA	GU_ONE_MINUS_DST_ALPHA
-	#define BLEND_DST_COLOR				GU_DST_COLOR
-	#define BLEND_ONE_MINUS_DST_COLOR	GU_ONE_MINUS_DST_COLOR
-	#define BLEND_SRC_ALPHA_SATURATE	BLEND_ONE
+#define BLEND_ZERO					0x1000
+#define BLEND_ONE					0x1002
+#define BLEND_SRC_COLOR				GU_SRC_COLOR
+#define BLEND_ONE_MINUS_SRC_COLOR	GU_ONE_MINUS_SRC_COLOR
+#define BLEND_SRC_ALPHA				GU_SRC_ALPHA
+#define BLEND_ONE_MINUS_SRC_ALPHA	GU_ONE_MINUS_SRC_ALPHA
+#define BLEND_DST_ALPHA				GU_DST_ALPHA
+#define BLEND_ONE_MINUS_DST_ALPHA	GU_ONE_MINUS_DST_ALPHA
+#define BLEND_DST_COLOR				GU_DST_COLOR
+#define BLEND_ONE_MINUS_DST_COLOR	GU_ONE_MINUS_DST_COLOR
+#define BLEND_SRC_ALPHA_SATURATE	BLEND_ONE

-	typedef struct
-	{
-		ScePspFVector2 texture;
-		ScePspFVector3 pos;
-	} PSPVertex3D;
+typedef struct
+{
+    ScePspFVector2 texture;
+    ScePspFVector3 pos;
+} PSPVertex3D;

-#elif !defined(WP8) //non PSP
+#elif (!defined WP8)

-	#define BLEND_ZERO					GL_ZERO
-	#define BLEND_ONE					GL_ONE
-	#define BLEND_SRC_COLOR				GL_SRC_COLOR
-	#define BLEND_ONE_MINUS_SRC_COLOR	GL_ONE_MINUS_SRC_COLOR
-	#define BLEND_SRC_ALPHA				GL_SRC_ALPHA
-	#define BLEND_ONE_MINUS_SRC_ALPHA	GL_ONE_MINUS_SRC_ALPHA
-	#define BLEND_DST_ALPHA				GL_DST_ALPHA
-	#define BLEND_ONE_MINUS_DST_ALPHA	GL_ONE_MINUS_DST_ALPHA
-	#define BLEND_DST_COLOR				GL_DST_COLOR
-	#define BLEND_ONE_MINUS_DST_COLOR	GL_ONE_MINUS_DST_COLOR
-	#define BLEND_SRC_ALPHA_SATURATE	GL_SRC_ALPHA_SATURATE
+
+#define BLEND_ZERO					GL_ZERO
+#define BLEND_ONE					GL_ONE
+#define BLEND_SRC_COLOR				GL_SRC_COLOR
+#define BLEND_ONE_MINUS_SRC_COLOR	GL_ONE_MINUS_SRC_COLOR
+#define BLEND_SRC_ALPHA				GL_SRC_ALPHA
+#define BLEND_ONE_MINUS_SRC_ALPHA	GL_ONE_MINUS_SRC_ALPHA
+#define BLEND_DST_ALPHA				GL_DST_ALPHA
+#define BLEND_ONE_MINUS_DST_ALPHA	GL_ONE_MINUS_DST_ALPHA
+#define BLEND_DST_COLOR				GL_DST_COLOR
+#define BLEND_ONE_MINUS_DST_COLOR	GL_ONE_MINUS_DST_COLOR
+#define BLEND_SRC_ALPHA_SATURATE	GL_SRC_ALPHA_SATURATE

  #define GU_PSM_8888 0
  #define GU_PSM_5551 0
@@ -287,7 +286,7 @@ typedef uint32_t u32;
  #define GU_PSM_4444 0
  #define GU_PSM_5650 0
 #endif
-#else
+#else // CONSOLE_CONFIG
 typedef uint32_t GLuint;
 typedef float GLfloat;
 #endif //CONSOLE_CONFIG
@@ -67,6 +67,9 @@ public:
 	void registerDefaultBindings();
 	static WagicCore* getInstance() { return s_instance; };
 	char *GetName(){ return m_launcher->GetName();};
+#ifdef QT_CONFIG
+    QTime startTime;
+#endif

 private:
    void doAndEnqueue(JButton action) {
@@ -75,6 +78,7 @@ private:
    }

 private:
+    friend int JGEGetTime();
 	static WagicCore* s_instance;
    JGE* m_engine;
    JApp* m_app;
@@ -16,7 +16,9 @@ User folder is the only one that is really needed to guarantee both read and wri
 The content that users should not be touching.
 */

+#ifndef PSP
 #include "PrecompiledHeader.h"
+#endif //PSP

 #ifdef WIN32
 #pragma warning(disable : 4786)
@@ -84,7 +84,6 @@ public: /* For easy interfacing with JGE static functions */
    bool            Running;
    SDL_Window*     window;
    SDL_Surface*    Surf_Display;
-//    SDL_Rect        viewPort;
    Uint32          lastMouseUpTime;
    Uint32          lastFingerDownTime;
    int             windowed_w;
@@ -19,8 +19,11 @@ WagicCore* WagicCore::s_instance = 0;
 WagicCore::WagicCore() :
    m_engine(0), m_app(0), m_launcher(0), m_active(false)
 {
+#ifdef QT_CONFIG
+    startTime = QTime::currentTime();
+#endif //QT_CONFIG
+    s_instance = this;
    m_lastTickCount = JGEGetTime();
-	s_instance = this;
 }

 void WagicCore::initApp()
@@ -367,7 +370,7 @@ int JGEGetTime()
 #ifdef SDL_CONFIG
 	return (int)SDL_GetTicks();
 #elif defined QT_CONFIG
-	return QTime::currentTime().elapsed();
+    return WagicCore::s_instance->startTime.msecsTo(QTime::currentTime());
 #elif defined WP8
 	return (int)GetTickCount64();
 #endif