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

Erwan

Browse Source 
-more JGE cleanup
-removed calls to BindTexture that were made out of the Render methods. Please let me know if this has side effects (and let's discuss it in that case)
-Still no luck with the purple screen bug :(
This commit is contained in:
wagic.the.homebrew@gmail.com
2009-10-03 08:50:44 +00:00
parent a8607ebf64
commit 888edfd5b8
9 changed files with 38 additions and 266 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
JGE/include/JRenderer.h
View File

@@ -160,12 +160,6 @@ public:
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
void EnableTextureFilter(bool flag); void EnableTextureFilter(bool flag);
//////////////////////////////////////////////////////////////////////////
/// Remove all textures from VRAM (PSP only)
///
//////////////////////////////////////////////////////////////////////////
void ResetPrivateVRAM();
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
/// Enable/disable swizzle optimization. (PSP only) /// Enable/disable swizzle optimization. (PSP only)
/// ///
@@ -546,15 +540,14 @@ private:
int mCurrentTex; int mCurrentTex;
int mCurrentBlend; int mCurrentBlend;
int mCurrentTextureFormat; int mCurrentTextureFormat;
int PixelSize(int textureMode); int PixelSize(int textureMode);
#endif #endif
bool mVsync; bool mVsync;
int mSwizzle; int mSwizzle;
int mTexCounter; int mTexCounter;
int mCurrentTextureFilter; int mCurrentTextureFilter;

3
JGE/include/JTypes.h
View File

@@ -220,8 +220,6 @@ typedef uint32_t u32;
typedef struct typedef struct
{ {
ScePspFVector2 texture; ScePspFVector2 texture;
//PIXEL_TYPE color;
//ScePspFVector3 normal;
ScePspFVector3 pos; ScePspFVector3 pos;
} PSPVertex3D; } PSPVertex3D;
@@ -244,7 +242,6 @@ struct Vertex
struct Vertex3D struct Vertex3D
{ {
float u, v; float u, v;
//float nx, ny, nz;
float x, y, z; float x, y, z;
}; };

174
JGE/src/JGfx.cpp
View File

@@ -164,11 +164,6 @@ JRenderer::~JRenderer()
} }
void JRenderer::ResetPrivateVRAM()
{
}
void JRenderer::InitRenderer() void JRenderer::InitRenderer()
{ {
@@ -270,9 +265,9 @@ void JRenderer::InitRenderer()
} }
void JRenderer::SetTexBlend(int src, int dest) void JRenderer::SetTexBlend(int src, int dest)
{ {
if (src != mCurrTexBlendSrc || dest != mCurrTexBlendDest) if (src != mCurrTexBlendSrc || dest != mCurrTexBlendDest)
{ {
mCurrTexBlendSrc = src; mCurrTexBlendSrc = src;
@@ -307,12 +302,6 @@ void JRenderer::EnableTextureFilter(bool flag)
mCurrentTextureFilter = TEX_FILTER_LINEAR; mCurrentTextureFilter = TEX_FILTER_LINEAR;
else else
mCurrentTextureFilter = TEX_FILTER_NEAREST; mCurrentTextureFilter = TEX_FILTER_NEAREST;
// if (flag)
// sceGuTexFilter(GU_LINEAR, GU_LINEAR);
// else
// sceGuTexFilter(GU_NEAREST, GU_NEAREST);
} }
@@ -324,7 +313,6 @@ void JRenderer::DestroyRenderer()
void JRenderer::BeginScene() void JRenderer::BeginScene()
{ {
//sceKernelDcacheWritebackInvalidateAll();
sceGuStart(GU_DIRECT, list); sceGuStart(GU_DIRECT, list);
if (m3DEnabled) if (m3DEnabled)
@@ -333,8 +321,8 @@ void JRenderer::BeginScene()
sceGuClear(GU_DEPTH_BUFFER_BIT|GU_COLOR_BUFFER_BIT); sceGuClear(GU_DEPTH_BUFFER_BIT|GU_COLOR_BUFFER_BIT);
} }
sceGuTexMode(TEXTURE_FORMAT, 0, 0, mSwizzle); sceGuTexMode(TEXTURE_FORMAT, 0, 0, mSwizzle);
mCurrentTextureFormat = TEXTURE_FORMAT;
if (mCurrentTextureFilter == TEX_FILTER_NEAREST) if (mCurrentTextureFilter == TEX_FILTER_NEAREST)
sceGuTexFilter(GU_NEAREST, GU_NEAREST); // GU_NEAREST good for tile-map sceGuTexFilter(GU_NEAREST, GU_NEAREST); // GU_NEAREST good for tile-map
@@ -347,6 +335,7 @@ void JRenderer::BeginScene()
void JRenderer::EndScene() void JRenderer::EndScene()
{ {
sceGuFinish(); sceGuFinish();
sceGuSync(0,0); sceGuSync(0,0);
if (mVsync) if (mVsync)
@@ -749,14 +738,6 @@ void JRenderer::RenderQuad(JQuad* quad, VertexColor* points)
vertices[3].u = quad->mX + quad->mWidth; vertices[3].u = quad->mX + quad->mWidth;
vertices[3].v = quad->mY + quad->mHeight; vertices[3].v = quad->mY + quad->mHeight;
// for (int i=0;i<4;i++)
// {
// vertices[i].color = points[i].color;
// vertices[i].x = points[i].x;
// vertices[i].y = points[i].y;
// vertices[i].z = points[i].z;
// }
vertices[0].color = points[3].color; vertices[0].color = points[3].color;
vertices[0].x = points[3].x; vertices[0].x = points[3].x;
vertices[0].y = points[3].y; vertices[0].y = points[3].y;
@@ -965,13 +946,11 @@ static void jpeg_mem_src(j_decompress_ptr cinfo, u8 *mem, int len)
int JRenderer::PixelSize(int textureMode){ int JRenderer::PixelSize(int textureMode){
switch (textureMode) { switch (textureMode) {
case PSP_DISPLAY_PIXEL_FORMAT_565: case GU_PSM_5650:
return 2; case GU_PSM_5551:
case PSP_DISPLAY_PIXEL_FORMAT_5551: case GU_PSM_4444:
return 2;
case PSP_DISPLAY_PIXEL_FORMAT_4444:
return 2; return 2;
case PSP_DISPLAY_PIXEL_FORMAT_8888: case GU_PSM_8888:
return 4; return 4;
} }
return PIXEL_SIZE; return PIXEL_SIZE;
@@ -999,19 +978,6 @@ void JRenderer::LoadJPG(TextureInfo &textureInfo, const char *filename, int mode
bits16 = NULL; bits16 = NULL;
bits32 = NULL; bits32 = NULL;
/*
FILE * fp = fopen(filenamenew, "rb");
if (fp==NULL)
return;
cinfo.err = jpeg_std_error(&jerr);
jpeg_create_decompress(&cinfo);
jpeg_stdio_src(&cinfo, fp);
*/
JFileSystem* fileSystem = JFileSystem::GetInstance(); JFileSystem* fileSystem = JFileSystem::GetInstance();
if (!fileSystem->OpenFile(filename)) if (!fileSystem->OpenFile(filename))
{ {
@@ -1031,12 +997,6 @@ void JRenderer::LoadJPG(TextureInfo &textureInfo, const char *filename, int mode
fileSystem->ReadFile(rawdata, rawsize); fileSystem->ReadFile(rawdata, rawsize);
fileSystem->CloseFile(); fileSystem->CloseFile();
/* if (rawdata[6] != 'J' || rawdata[7] != 'F' || rawdata[8] != 'I' || rawdata[9] != 'F')
{
delete [] rawdata;
return;
} */
cinfo.err = jpeg_std_error(&jerr); cinfo.err = jpeg_std_error(&jerr);
jpeg_create_decompress(&cinfo); jpeg_create_decompress(&cinfo);
@@ -1062,10 +1022,9 @@ void JRenderer::LoadJPG(TextureInfo &textureInfo, const char *filename, int mode
int size = tw * th * pixelSize; int size = tw * th * pixelSize;
if (useVideoRAM)// && (mCurrentPointer+size)<0x200000) if (useVideoRAM)
{ {
//bits = (PIXEL_TYPE*) (0x04000000+0x40000000+mCurrentPointer);
//mCurrentPointer += size;
if (pixelSize == 2){ if (pixelSize == 2){
bits16 = (u16*)valloc(size); bits16 = (u16*)valloc(size);
}else{ }else{
@@ -1085,19 +1044,17 @@ void JRenderer::LoadJPG(TextureInfo &textureInfo, const char *filename, int mode
} }
} }
//rgbadata = (u8 *)bits;
rgbadata16 = bits16; rgbadata16 = bits16;
rgbadata32 = bits32; rgbadata32 = bits32;
if (mSwizzle) if (mSwizzle)
{ {
//rgbadata = (u8 *) memalign(16, size);
if (rgbadata16) rgbadata16 = (u16*) memalign(16, size); if (rgbadata16) rgbadata16 = (u16*) memalign(16, size);
if (rgbadata32) rgbadata32 = (u32*) memalign(16, size); if (rgbadata32) rgbadata32 = (u32*) memalign(16, size);
if(!rgbadata16 && !rgbadata32) if(!rgbadata16 && !rgbadata32)
{ {
jpeg_destroy_decompress(&cinfo); jpeg_destroy_decompress(&cinfo);
if (videoRAMUsed){ if (videoRAMUsed){
//mCurrentPointer -= size;
if (bits16) vfree(bits16); if (bits16) vfree(bits16);
if (bits32) vfree(bits32); if (bits32) vfree(bits32);
}else{ }else{
@@ -1146,27 +1103,23 @@ void JRenderer::LoadJPG(TextureInfo &textureInfo, const char *filename, int mode
int g = p[1]; int g = p[1];
int b = p[2]; int b = p[2];
switch (textureMode) { switch (textureMode) {
case PSP_DISPLAY_PIXEL_FORMAT_565: case GU_PSM_5650:
color16 = (r >> 3) | ((g >> 2) << 5) | ((b >> 3) << 11); color16 = (r >> 3) | ((g >> 2) << 5) | ((b >> 3) << 11);
*(q16) = color16; *(q16) = color16;
break; break;
case PSP_DISPLAY_PIXEL_FORMAT_5551: case GU_PSM_5551:
color16 = (r >> 3) | ((g >> 3) << 5) | ((b >> 3) << 10) | ((a >> 7) << 15); color16 = (r >> 3) | ((g >> 3) << 5) | ((b >> 3) << 10) | ((a >> 7) << 15);
*(q16) = color16; *(q16) = color16;
break; break;
case PSP_DISPLAY_PIXEL_FORMAT_4444: case GU_PSM_4444:
color16 = (r >> 4) | ((g >> 4) << 4) | ((b >> 4) << 8) | ((a >> 4) << 12); color16 = (r >> 4) | ((g >> 4) << 4) | ((b >> 4) << 8) | ((a >> 4) << 12);
*(q16) = color16; *(q16) = color16;
break; break;
case PSP_DISPLAY_PIXEL_FORMAT_8888: case GU_PSM_8888:
color32 = r | (g << 8) | (b << 16) | (a << 24); color32 = r | (g << 8) | (b << 16) | (a << 24);
*(q32) = color32; *(q32) = color32;
break; break;
} }
//q[0] = p[0];
//q[1] = p[1];
//q[2] = p[2];
//q[3] = 255;
p+=3; p+=3;
if (q16) q16+=1; if (q16) q16+=1;
@@ -1183,7 +1136,6 @@ void JRenderer::LoadJPG(TextureInfo &textureInfo, const char *filename, int mode
}catch(...){} }catch(...){}
if (mSwizzle) if (mSwizzle)
{ {
if (rgbadata16){ if (rgbadata16){
@@ -1207,7 +1159,6 @@ void JRenderer::LoadJPG(TextureInfo &textureInfo, const char *filename, int mode
textureInfo.mVRAM =videoRAMUsed; textureInfo.mVRAM =videoRAMUsed;
jpeg_destroy_decompress(&cinfo); jpeg_destroy_decompress(&cinfo);
// fclose(fp);
delete [] rawdata; delete [] rawdata;
} }
@@ -1220,10 +1171,14 @@ JTexture* JRenderer::LoadTexture(const char* filename, int mode, int textureMode
if (strstr(filename, ".jpg")!=NULL || strstr(filename, ".JPG")!=NULL) if (strstr(filename, ".jpg")!=NULL || strstr(filename, ".JPG")!=NULL)
LoadJPG(textureInfo, filename, mode, textureMode); LoadJPG(textureInfo, filename, mode, textureMode);
else if(strstr(filename, ".gif")!=NULL || strstr(filename, ".GIF")!=NULL) else if(strstr(filename, ".gif")!=NULL || strstr(filename, ".GIF")!=NULL) {
textureMode = TEXTURE_FORMAT; //textureMode not supported in Gif yet
LoadGIF(textureInfo,filename, mode, textureMode); LoadGIF(textureInfo,filename, mode, textureMode);
else if(strstr(filename, ".png")!=NULL || strstr(filename, ".PNG")!=NULL) }
else if(strstr(filename, ".png")!=NULL || strstr(filename, ".PNG")!=NULL) {
textureMode = TEXTURE_FORMAT; //textureMode not supported in PNG yet
LoadPNG(textureInfo, filename, mode, textureMode); LoadPNG(textureInfo, filename, mode, textureMode);
}
if (textureInfo.mBits == NULL) if (textureInfo.mBits == NULL)
return NULL; return NULL;
@@ -1251,8 +1206,7 @@ JTexture* JRenderer::LoadTexture(const char* filename, int mode, int textureMode
if (!done) if (!done)
{ {
delete tex; SAFE_DELETE(tex);
tex = NULL;
} }
return tex; return tex;
@@ -1286,20 +1240,18 @@ void JRenderer::LoadPNG(TextureInfo &textureInfo, const char* filename, int mode
png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
if (png_ptr == NULL) { if (png_ptr == NULL) {
//fclose(fp);
fileSystem->CloseFile(); fileSystem->CloseFile();
return; return;
} }
png_set_error_fn(png_ptr, (png_voidp) NULL, (png_error_ptr) NULL, PNGCustomWarningFn); png_set_error_fn(png_ptr, (png_voidp) NULL, (png_error_ptr) NULL, PNGCustomWarningFn);
info_ptr = png_create_info_struct(png_ptr); info_ptr = png_create_info_struct(png_ptr);
if (info_ptr == NULL) { if (info_ptr == NULL) {
//fclose(fp);
fileSystem->CloseFile(); fileSystem->CloseFile();
png_destroy_read_struct(&png_ptr, png_infopp_NULL, png_infopp_NULL); png_destroy_read_struct(&png_ptr, png_infopp_NULL, png_infopp_NULL);
return; return;
} }
png_init_io(png_ptr, NULL); png_init_io(png_ptr, NULL);
png_set_read_fn(png_ptr, (png_voidp)fileSystem, PNGCustomReadDataFn); png_set_read_fn(png_ptr, (png_voidp)fileSystem, PNGCustomReadDataFn);
png_set_sig_bytes(png_ptr, sig_read); png_set_sig_bytes(png_ptr, sig_read);
png_read_info(png_ptr, info_ptr); png_read_info(png_ptr, info_ptr);
@@ -1312,10 +1264,9 @@ void JRenderer::LoadPNG(TextureInfo &textureInfo, const char* filename, int mode
png_set_filler(png_ptr, 0xff, PNG_FILLER_AFTER); png_set_filler(png_ptr, 0xff, PNG_FILLER_AFTER);
line = (u32*) malloc(width * 4); line = (u32*) malloc(width * 4);
if (!line) { if (!line) {
//fclose(fp);
fileSystem->CloseFile(); fileSystem->CloseFile();
png_destroy_read_struct(&png_ptr, png_infopp_NULL, png_infopp_NULL); png_destroy_read_struct(&png_ptr, png_infopp_NULL, png_infopp_NULL);
return; return;
} }
int texWidth = getNextPower2(width); int texWidth = getNextPower2(width);
@@ -1328,11 +1279,8 @@ void JRenderer::LoadPNG(TextureInfo &textureInfo, const char* filename, int mode
{ {
if (useVideoRAM)// && (mCurrentPointer+size)<0x200000) if (useVideoRAM)
{ {
//bits = (PIXEL_TYPE*) (0x04000000+0x40000000+mCurrentPointer);
//mCurrentPointer += size;
bits = (PIXEL_TYPE*) valloc(size); bits = (PIXEL_TYPE*) valloc(size);
videoRAMUsed = true; videoRAMUsed = true;
} }
@@ -1420,7 +1368,6 @@ void JRenderer::LoadPNG(TextureInfo &textureInfo, const char* filename, int mode
textureInfo.mBits = NULL; textureInfo.mBits = NULL;
if (videoRAMUsed) if (videoRAMUsed)
//mCurrentPointer -= size;
vfree(bits); vfree(bits);
else else
free(bits); free(bits);
@@ -1550,9 +1497,6 @@ int JRenderer::image_readgif(void * handle, TextureInfo &textureInfo, DWORD * bg
{ {
DWORD color32 = gif_color32(LineIn[j]); DWORD color32 = gif_color32(LineIn[j]);
//if(mTexLoadingCB) mTexLoadingCB(color32);
//if(JRenderer::GetInstance()->GetTextureLoadingCallback())
//JRenderer::GetInstance()->GetTextureLoadingCallback()(color32);
*imgdata++ = color32; *imgdata++ = color32;
} }
@@ -1594,7 +1538,6 @@ int JRenderer::image_readgif(void * handle, TextureInfo &textureInfo, DWORD * bg
if(textureInfo.mBits != NULL) if(textureInfo.mBits != NULL)
{ {
if (videoRAMUsed) if (videoRAMUsed)
//mCurrentPointer -= size;
vfree(textureInfo.mBits); vfree(textureInfo.mBits);
else else
free((void *)textureInfo.mBits); free((void *)textureInfo.mBits);
@@ -1624,10 +1567,8 @@ int JRenderer::image_readgif(void * handle, TextureInfo &textureInfo, DWORD * bg
int image_gif_read(GifFileType * ft, GifByteType * buf, int size) int image_gif_read(GifFileType * ft, GifByteType * buf, int size)
{ {
//return fread(buf, 1, size, (FILE *)ft->UserData);
JFileSystem *fileSys = (JFileSystem *)ft->UserData; JFileSystem *fileSys = (JFileSystem *)ft->UserData;
//return fread(buf, 1, size, (FILE *)ft->UserData);
if (fileSys->ReadFile(buf, size)) if (fileSys->ReadFile(buf, size))
return size; return size;
else else
@@ -1638,12 +1579,7 @@ int image_gif_read(GifFileType * ft, GifByteType * buf, int size)
void JRenderer::LoadGIF(TextureInfo &textureInfo, const char *filename, int mode, int textureMode) void JRenderer::LoadGIF(TextureInfo &textureInfo, const char *filename, int mode, int textureMode)
{ {
textureInfo.mBits = NULL; textureInfo.mBits = NULL;
//bool useVideoRAM = (mode == TEX_TYPE_USE_VRAM);
///*
//FILE * fp = fopen(filename, "rb");
//if(fp == NULL)
// return;
JFileSystem *fileSys = JFileSystem::GetInstance(); JFileSystem *fileSys = JFileSystem::GetInstance();
if (!fileSys->OpenFile(filename)) if (!fileSys->OpenFile(filename))
@@ -1651,20 +1587,12 @@ void JRenderer::LoadGIF(TextureInfo &textureInfo, const char *filename, int mode
DWORD bkcol; DWORD bkcol;
int result = image_readgif(fileSys, textureInfo, &bkcol, image_gif_read, mode); int result = image_readgif(fileSys, textureInfo, &bkcol, image_gif_read, mode);
//----------------------------------------
// pixel ** image_data=NULL;
//----------------------------------------
if(result!=0) if(result!=0)
textureInfo.mBits=NULL; textureInfo.mBits=NULL;
//textureInfo.mTexWidth = getNextPower2(textureInfo.mWidth);
//textureInfo.mTexHeight = getNextPower2(textureInfo.mHeight);
//fclose(fp);
fileSys->CloseFile(); fileSys->CloseFile();
return ;//*/ return ;
} }
@@ -1678,17 +1606,16 @@ JTexture* JRenderer::CreateTexture(int width, int height, int mode)
{ {
tex->mWidth = width; tex->mWidth = width;
tex->mHeight = height; tex->mHeight = height;
//tex->mFlip = false;
tex->mTexWidth = getNextPower2(width); tex->mTexWidth = getNextPower2(width);
tex->mTexHeight = getNextPower2(height); tex->mTexHeight = getNextPower2(height);
int size = tex->mTexWidth * tex->mTexHeight * sizeof(PIXEL_TYPE); int size = tex->mTexWidth * tex->mTexHeight * sizeof(PIXEL_TYPE);
if (useVideoRAM)// && (mCurrentPointer+size)<0x200000) if (useVideoRAM)
{ {
tex->mInVideoRAM = true; tex->mInVideoRAM = true;
tex->mBits = (PIXEL_TYPE*) valloc(size);// (0x04000000+0x40000000+mCurrentPointer); tex->mBits = (PIXEL_TYPE*) valloc(size);
//mCurrentPointer += size;
} }
//else //else
@@ -1706,21 +1633,7 @@ JTexture* JRenderer::CreateTexture(int width, int height, int mode)
return tex; return tex;
} }
//------------------------------------------------------------------------------------------------
// void JRenderer::FreeTexture(JTexture* tex)
// {
// if (tex)
// {
// if (tex->mBits && !tex->mInVideoRAM)
// free(tex->mBits);
//
// delete tex;
// tex = NULL;
// }
// }
//------------------------------------------------------------------------------------------------
void JRenderer::BindTexture(JTexture *tex) void JRenderer::BindTexture(JTexture *tex)
{ {
if (mCurrentTex != tex->mTexId) if (mCurrentTex != tex->mTexId)
@@ -1771,11 +1684,6 @@ void JRenderer::SetClip(int x, int y, int width, int height)
sceGuScissor(x, y, width, height); sceGuScissor(x, y, width, height);
} }
// void JRenderer::SetLineWidth(float width)
// {
// mLineWidth = width;
// }
void JRenderer::LoadIdentity() void JRenderer::LoadIdentity()
{ {
@@ -1841,9 +1749,6 @@ void JRenderer::RenderTriangles(JTexture* texture, Vertex3D *tris, int start, in
vertices[n].pos.y = tris[index].y; vertices[n].pos.y = tris[index].y;
vertices[n].pos.z = tris[index].z; vertices[n].pos.z = tris[index].z;
//vertices[n].normal.x = tris[index].nx;
//vertices[n].normal.y = tris[index].ny;
//vertices[n].normal.z = tris[index].nz;
index++; index++;
n++; n++;
@@ -1855,9 +1760,6 @@ void JRenderer::RenderTriangles(JTexture* texture, Vertex3D *tris, int start, in
vertices[n].pos.y = tris[index].y; vertices[n].pos.y = tris[index].y;
vertices[n].pos.z = tris[index].z; vertices[n].pos.z = tris[index].z;
//vertices[n].normal.x = tris[index].nx;
//vertices[n].normal.y = tris[index].ny;
//vertices[n].normal.z = tris[index].nz;
index++; index++;
n++; n++;
@@ -1869,9 +1771,6 @@ void JRenderer::RenderTriangles(JTexture* texture, Vertex3D *tris, int start, in
vertices[n].pos.y = tris[index].y; vertices[n].pos.y = tris[index].y;
vertices[n].pos.z = tris[index].z; vertices[n].pos.z = tris[index].z;
//vertices[n].normal.x = tris[index].nx;
//vertices[n].normal.y = tris[index].ny;
//vertices[n].normal.z = tris[index].nz;
index++; index++;
n++; n++;
@@ -2027,7 +1926,6 @@ void JRenderer::FillCircle(float x, float y, float radius, PIXEL_TYPE color)
void JRenderer::DrawPolygon(float x, float y, float size, int count, float startingAngle, PIXEL_TYPE color) void JRenderer::DrawPolygon(float x, float y, float size, int count, float startingAngle, PIXEL_TYPE color)
{ {
float angle = startingAngle*RAD2DEG; float angle = startingAngle*RAD2DEG;
float firstAngle = angle; float firstAngle = angle;
float steps = 360.0f/count; float steps = 360.0f/count;
@@ -2062,7 +1960,6 @@ void JRenderer::DrawPolygon(float x, float y, float size, int count, float start
void JRenderer::FillPolygon(float x, float y, float size, int count, float startingAngle, PIXEL_TYPE color) void JRenderer::FillPolygon(float x, float y, float size, int count, float startingAngle, PIXEL_TYPE color)
{ {
float angle = startingAngle*RAD2DEG; float angle = startingAngle*RAD2DEG;
float firstAngle = angle; float firstAngle = angle;
float steps = 360.0f/count; float steps = 360.0f/count;
@@ -2115,16 +2012,15 @@ void JRenderer::DrawRoundRect( float x1,float y1, float w,float h,float radius,P
} }
else if (i > y2-y1) else if (i > y2-y1)
{ {
//(i-(y2-y1-radius))
q=(float)sqrt(radius*radius - (i-(y2-y1))*(i-(y2-y1))); q=(float)sqrt(radius*radius - (i-(y2-y1))*(i-(y2-y1)));
nextq=(float)sqrt(radius*radius - (i+1-(y2-y1))*(i+1-(y2-y1))); nextq=(float)sqrt(radius*radius - (i+1-(y2-y1))*(i+1-(y2-y1)));
} }
if (nextq == q) nextq = q+1; if (nextq == q) nextq = q+1;
if (i==-radius || i == y2-y1+radius-1){ if (i==-radius || i == y2-y1+radius-1){
JRenderer::GetInstance()->DrawLine(x1+(radius-q),y1+i+radius,x2+q+radius,y1+i+radius,color); DrawLine(x1+(radius-q),y1+i+radius,x2+q+radius,y1+i+radius,color);
}else{ }else{
JRenderer::GetInstance()->DrawLine(x1+(radius-q),y1+i+radius,x1+(radius-nextq),y1+i+radius,color); DrawLine(x1+(radius-q),y1+i+radius,x1+(radius-nextq),y1+i+radius,color);
JRenderer::GetInstance()->DrawLine(x2+radius+q,y1+i+radius,x2+radius+nextq,y1+i+radius,color); DrawLine(x2+radius+q,y1+i+radius,x2+radius+nextq,y1+i+radius,color);
} }
} }
} }

25
JGE/src/JMD2Model.cpp
View File

@@ -435,31 +435,6 @@ void JMD2Model::Render()
if (mModel == NULL) if (mModel == NULL)
return; return;
// int startFrame = mAnimations[mState]->mStartFrame;
// int endFrame = mAnimations[mState]->mEndFrame;
//
// if ( (startFrame < 0) || (endFrame < 0) )
// return;
//
// if ( (startFrame >= mModel->numFrames) || (endFrame >= mModel->numFrames) )
// return;
// if (mModel->interpol >= 1.0)
// {
// mModel->interpol = 0.0f;
// mModel->currentFrame++;
// if (mModel->currentFrame >= endFrame)
// mModel->currentFrame = startFrame;
//
// mModel->nextFrame = mModel->currentFrame + 1;
//
// if (mModel->nextFrame >= endFrame)
// {
// mModel->nextFrame = startFrame;
// CheckNextState();
// }
// }
pointList = &mModel->pointList[mModel->numPoints*mModel->currentFrame]; pointList = &mModel->pointList[mModel->numPoints*mModel->currentFrame];
nextPointList = &mModel->pointList[mModel->numPoints*mModel->nextFrame]; nextPointList = &mModel->pointList[mModel->numPoints*mModel->nextFrame];

29
JGE/src/linux/JGfx.cpp
View File

@@ -69,13 +69,6 @@ void JQuad::GetTextureRect(float *x, float *y, float *w, float *h)
} }
// void JQuad::SetColor(JColor color)
// {
// for (int i=0;i<4;i++)
// mColor[i].color = color.color;
// }
//
void JQuad::SetColor(PIXEL_TYPE color) void JQuad::SetColor(PIXEL_TYPE color)
{ {
for (int i=0;i<4;i++) for (int i=0;i<4;i++)
@@ -254,22 +247,6 @@ void JRenderer::RenderQuad(JQuad* quad, float xo, float yo, float angle, float x
pt[1] = Vector2D(x+width, y-height); pt[1] = Vector2D(x+width, y-height);
pt[0] = Vector2D(x, y-height); pt[0] = Vector2D(x, y-height);
// if (angle != 0.0f)
// {
// float xx, yy;
// float cosAngle = cosf(angle);
// float sinAngle = sinf(angle);
// for (int i=0;i<4;i++)
// {
// xx = (cosAngle*(pt[i].x-xo) - sinAngle*(pt[i].y-yo) + xo);
// yy = (sinAngle*(pt[i].x-xo) + cosAngle*(pt[i].y-yo) + yo);
// pt[i].x = xx;
// pt[i].y = yy;
// }
// }
//
// for (int i=0;i<4;i++)
// pt[i].y = SCREEN_HEIGHT_F - pt[i].y;
Vector2D uv[4]; Vector2D uv[4];
uv[0] = Vector2D(quad->mTX0, quad->mTY1); uv[0] = Vector2D(quad->mTX0, quad->mTY1);
@@ -1269,12 +1246,6 @@ void JRenderer::SetTexBlendDest(int dest)
} }
void JRenderer::ResetPrivateVRAM()
{
}
void JRenderer::Enable2D() void JRenderer::Enable2D()
{ {
if (mCurrentRenderMode == MODE_2D) if (mCurrentRenderMode == MODE_2D)

54
JGE/src/main.cpp
View File

@@ -1,6 +1,3 @@
#include <pspkernel.h> #include <pspkernel.h>
#include <pspdisplay.h> #include <pspdisplay.h>
#include <pspdebug.h> #include <pspdebug.h>
@@ -18,8 +15,6 @@
#include <stdio.h> #include <stdio.h>
//#include <mikmod.h>
#include "../../JGE/include/JGE.h" #include "../../JGE/include/JGE.h"
#include "../../JGE/include/JApp.h" #include "../../JGE/include/JApp.h"
#include "../../JGE/include/JGameLauncher.h" #include "../../JGE/include/JGameLauncher.h"
@@ -39,8 +34,8 @@
#else #else
PSP_MODULE_INFO(JGEApp_Title, 0x1000, 1, 1); PSP_MODULE_INFO(JGEApp_Title, 0x1000, 1, 1);
PSP_MAIN_THREAD_ATTR(0); PSP_MAIN_THREAD_ATTR(0);
//PSP_MAIN_THREAD_ATTR(THREAD_ATTR_USER);
#endif #endif
@@ -72,7 +67,6 @@ int power_callback(int unknown, int pwrflags, void *common)
if (engine != NULL) if (engine != NULL)
engine->Pause(); engine->Pause();
//sceKernelDelayThread(1000000);
} }
else if ((pwrflags & PSP_POWER_CB_RESUME_COMPLETE) > 0) else if ((pwrflags & PSP_POWER_CB_RESUME_COMPLETE) > 0)
{ {
@@ -82,35 +76,6 @@ int power_callback(int unknown, int pwrflags, void *common)
engine->Resume(); engine->Resume();
} }
// /* check for power switch and suspending as one is manual and the other automatic */
// if (pwrflags & PSP_POWER_CB_POWER_SWITCH || pwrflags & PSP_POWER_CB_SUSPENDING)
// {
// // suspending
// if (engine != NULL)
// engine->Pause();
// }
// else if (pwrflags & PSP_POWER_CB_RESUMING)
// {
// // resuming from suspend mode
//
// }
// else if (pwrflags & PSP_POWER_CB_RESUME_COMPLETE)
// {
// // resume complete
// if (engine != NULL)
// engine->Resume();
// }
// else if (pwrflags & PSP_POWER_CB_STANDBY)
// {
// // entering standby mode
// if (engine != NULL)
// engine->Pause();
// }
// else
// {
// // unhandled power event
// }
// sceDisplayWaitVblankStart();
return 0; return 0;
} }
@@ -133,21 +98,6 @@ int CallbackThread(SceSize args, void *argp)
return 0; return 0;
} }
//------------------------------------------------------------------------------------------------
// static int AudioChannelThread(SceSize args, void *argp)
// {
// while (!done)
// {
// MikMod_Update();
// // We have to sleep here to allow other threads a chance to process.
// // with no sleep this thread will take over when the output is disabled via MikMod_DisableOutput()
// // co-operative threading sucks bigtime...
// sceKernelDelayThread(1);
// }
// return (0);
// }
//------------------------------------------------------------------------------------------------
// Sets up the callback thread and returns its thread id // Sets up the callback thread and returns its thread id
int SetupCallbacks(void) int SetupCallbacks(void)
{ {

6
JGE/src/win/JRenderer_Win.cpp
View File

@@ -1312,12 +1312,6 @@ void JRenderer::SetTexBlendDest(int dest)
} }
void JRenderer::ResetPrivateVRAM()
{
}
void JRenderer::Enable2D() void JRenderer::Enable2D()
{ {
if (mCurrentRenderMode == MODE_2D) if (mCurrentRenderMode == MODE_2D)

2
projects/mtg/src/OptionItem.cpp
View File

@@ -218,7 +218,6 @@ void OptionProfile::updateValue(){
} }
void OptionProfile::populate(){ void OptionProfile::populate(){
JRenderer * renderer = JRenderer::GetInstance();
string temp = options[Options::ACTIVE_PROFILE].str; string temp = options[Options::ACTIVE_PROFILE].str;
if (value >= selections.size()){ //TODO fail gracefully. if (value >= selections.size()){ //TODO fail gracefully.
return; return;
@@ -231,7 +230,6 @@ void OptionProfile::populate(){
mAvatarTex = JRenderer::GetInstance()->LoadTexture(options.profileFile("avatar.jpg","",true,true).c_str(), false); mAvatarTex = JRenderer::GetInstance()->LoadTexture(options.profileFile("avatar.jpg","",true,true).c_str(), false);
if (mAvatarTex){ if (mAvatarTex){
mAvatar = NEW JQuad(mAvatarTex, 0, 0, 35, 50); mAvatar = NEW JQuad(mAvatarTex, 0, 0, 35, 50);
renderer->BindTexture(mAvatarTex);
} }
PlayerData * pdata = NEW PlayerData(app->collection); PlayerData * pdata = NEW PlayerData(app->collection);

2
projects/mtg/src/WResourceManager.cpp
View File

@@ -414,7 +414,6 @@ JTexture * WResourceManager::RetrieveTexture(string filename, int style, int sub
if(res){ //a non-null result will always be good. if(res){ //a non-null result will always be good.
JTexture * t = res->Actual(); JTexture * t = res->Actual();
JRenderer::GetInstance()->BindTexture(t);
return t; return t;
} }
#ifdef DEBUG_CACHE #ifdef DEBUG_CACHE
@@ -864,7 +863,6 @@ void WResourceManager::Refresh(){
newNames[oldtex] = mapping->first; newNames[oldtex] = mapping->first;
else{ else{
newNames[newtex] = mapping->first; newNames[newtex] = mapping->first;
JRenderer::GetInstance()->BindTexture(newtex);
} }
oldTextures[oldtex] = newtex; oldTextures[oldtex] = newtex;