Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Erwan

Browse Source 
-Improved JGE texture loading, improved Wagic cache
- Jge small changes in mp3 methods
This commit is contained in:
wagic.the.homebrew@gmail.com
2009-04-09 13:31:07 +00:00
parent 4a8aaf5187
commit 387c75e16d
14 changed files with 177 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
JGE/include/JRenderer.h
View File

@@ -124,7 +124,7 @@ public:
/// @param mode - Choose to put texture in VRAM (PSP only).
///
//////////////////////////////////////////////////////////////////////////
JTexture* LoadTexture(const char* filename, int mode = 0);
JTexture* LoadTexture(const char* filename, int mode = 0, int textureFormat = TEXTURE_FORMAT);
//////////////////////////////////////////////////////////////////////////
/// Create texture from memory on the fly.
@@ -527,10 +527,10 @@ private:
bool mVRAM;
};
void LoadJPG(TextureInfo &textureInfo, const char *filename, int mode = 0);
void LoadPNG(TextureInfo &textureInfo, const char *filename, int mode = 0);
void LoadGIF(TextureInfo &textureInfo, const char *filename, int mode = 0);
int image_readgif(void * handle, TextureInfo &textureInfo, DWORD * bgcolor, InputFunc readFunc,int mode = 0);
void LoadJPG(TextureInfo &textureInfo, const char *filename, int mode = 0, int TextureFormat = TEXTURE_FORMAT);
void LoadPNG(TextureInfo &textureInfo, const char *filename, int mode = 0, int TextureFormat = TEXTURE_FORMAT);
void LoadGIF(TextureInfo &textureInfo, const char *filename, int mode = 0, int TextureFormat = TEXTURE_FORMAT);
int image_readgif(void * handle, TextureInfo &textureInfo, DWORD * bgcolor, InputFunc readFunc,int mode = 0, int TextureFormat = TEXTURE_FORMAT);
static JRenderer* mInstance;
@@ -547,6 +547,9 @@ private:
PIXEL_TYPE* mVRAM;
int mCurrentTex;
int mCurrentBlend;
int mCurrentTextureFormat;
int PixelSize(int textureMode);
#endif

4
JGE/include/JSoundSystem.h
View File

@@ -48,6 +48,7 @@ public:
JMusic();
~JMusic();
void Update();
int getPlayTime();
#if defined (WIN32) || defined (LINUX)
FSOUND_SAMPLE *mTrack; // MP3 needed to be of "sample" type for FMOD, FMUSIC_MODULE is for MODs
@@ -173,6 +174,7 @@ public:
//////////////////////////////////////////////////////////////////////////
void SetVolume(int volume);
int mChannel;
protected:
JSoundSystem();
~JSoundSystem();
@@ -189,7 +191,7 @@ private:
#endif
int mVolume;
int mChannel;
static JSoundSystem* mInstance;

7
JGE/include/JTypes.h
View File

@@ -143,7 +143,10 @@ typedef uint32_t u32;
PSP_CTRL_NOTE = 0x800000
} PspCtrlButtons;
#define TEXTURE_FORMAT 0
#define GU_PSM_8888 0
#define GU_PSM_5551 0
#define GU_PSM_4444 0
#define PIXEL_TYPE DWORD
#else // PSP
@@ -327,7 +330,7 @@ public:
#if defined (WIN32) || defined (LINUX)
GLuint mTexId;
#else
int mTextureFormat;
int mTexId;
bool mInVideoRAM;
PIXEL_TYPE* mBits;