diff --git a/README.md b/README.md index 6aa9517..83d7686 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,7 @@ # re3-symbian -Work-in-progress port of GTA III for Symbian devices. +Work-in-progress port of GTA III for Symbian devices.\ +Supports S60 3rd Edition FP1, S60 5th edition Symbian^3 and later. Based on re3, uses some code from [Dreamcast](https://gitlab.com/skmp/dca3-game) and [Vita](https://github.com/Rinnegatamante/librw-vita) ports. @@ -8,13 +9,6 @@ Based on re3, uses some code from [Dreamcast](https://gitlab.com/skmp/dca3-game) See [TODO.md](/TODO.md) for more details on project state. -## Device requirements - -- S60 3rd Edition FP1, S60 5th Edition (non-Nokia), Symbian^3 or later -- GPU -- 128 MB RAM with at least 50 MB free (won't run on regular 64 MB N95 unless you disable all textures) -- Functional E: drive with 400 MB of free space (will be more as it'll start to support audio) - Tested devices: - Belle with BCM2763 (700) - GLES 2.0 - Anna/Belle with BCM2727 (E7, N8, E6) - GLES 2.0 diff --git a/TODO.md b/TODO.md index c78f917..32eb71c 100644 --- a/TODO.md +++ b/TODO.md @@ -10,20 +10,19 @@ Common: - [x] Merge S60v3 and ^3 branches - [ ] Simplify geometry - [ ] Move map to top left corner -- [ ] Too many draw calls +- [ ] Do something with sprites, they're still taking too much frame time - [ ] Audio GLES 2.0 specific: - [x] Optimize to always run 10+ fps - [x] Fix skinning shader (cutscene heads require it) -- [x] Fix face animations in optimized builds -- [x] Disappearing background in cutscenes -- [x] Huge lag spikes on VC4 -- [x] Skinning shader is still broken on VC4 - [ ] Optimize to always run 20+ fps - [ ] Use etc1 compression -- [ ] HUD still disappearing sometimes on VC3 -- [ ] Effects are slowing the render on VC4 +- [ ] Fix face animations in optimized builds +- [ ] Skinning shader is still broken on VC4 +- [ ] Disappearing background in cutscenes +- [ ] HUD still disappearing sometimes +- [ ] Huge lag spikes on VC4 GLES 1.1 specific: - [x] Backport to STLport v4 @@ -36,6 +35,6 @@ GLES 1.1 specific: - [ ] Fix lighting Issues: -- [ ] Fix crash in Texture::destroy on exit +- [x] Fix crash in Texture::destroy on exit - [x] Save menu is too slow - [x] Crash when picking up a bat diff --git a/group/librw.mmh b/group/librw.mmh index 2276d21..b38f518 100644 --- a/group/librw.mmh +++ b/group/librw.mmh @@ -25,4 +25,4 @@ SOURCEPATH ../vendor/librw/src/ps2 SOURCE pds.cpp ps2.cpp ps2device.cpp ps2matfx.cpp ps2raster.cpp ps2skin.cpp SOURCEPATH ../vendor/librw/src SOURCE raster.cpp render.cpp skin.cpp texture.cpp tga.cpp tristrip.cpp userdata.cpp uvanim.cpp world.cpp -SOURCE assert.cpp printf_stub.c +SOURCE assert.cpp diff --git a/sis/re3-gles1.pkg b/sis/re3-gles1.pkg index 93aa794..2f70b53 100644 --- a/sis/re3-gles1.pkg +++ b/sis/re3-gles1.pkg @@ -1,4 +1,4 @@ -#{"GTA III"},(0xe0d67647),1,0,3 +#{"GTA III"},(0xe0d67647),1,0,2 [0x101F7961], 0, 0, 0, {"S60ProductID"} ; S60v3 [0x1028315F], 0, 0, 0, {"S60ProductID"} ; ^1 diff --git a/sis/re3.pkg b/sis/re3.pkg index 4b38c53..e570f2e 100644 --- a/sis/re3.pkg +++ b/sis/re3.pkg @@ -1,4 +1,4 @@ -#{"GTA III"},(0xe0d67647),1,0,3 +#{"GTA III"},(0xe0d67647),1,0,2 [0x101F7961], 0, 0, 0, {"S60ProductID"} ; S60v3 [0x1028315F], 0, 0, 0, {"S60ProductID"} ; ^1 @@ -7,7 +7,7 @@ %{"nnproject"} :"nnproject" -IF (NOT package(0x20009A80)) OR (NOT package(0x2002372A)) OR (NOT package(0x10282872)) ; old or missing openc +IF (NOT package(0x20009A80)) OR (NOT package(0x2002372A)) ; old or missing openc "incompatible_openc.txt"-"", FT, FORCEABORT ENDIF diff --git a/src/core/config.h b/src/core/config.h index 10edd1b..9771ebe 100644 --- a/src/core/config.h +++ b/src/core/config.h @@ -394,9 +394,9 @@ enum Config { #define USE_MEASUREMENTS_IN_METERS // makes game use meters instead of feet in script #define USE_PRECISE_MEASUREMENT_CONVERTION // makes game convert feet to meeters more precisely #ifdef PC_MENU -# define MISSION_REPLAY // mobile feature +//# define MISSION_REPLAY // mobile feature #endif -#define SIMPLIER_MISSIONS // apply simplifications from mobile +//#define SIMPLIER_MISSIONS // apply simplifications from mobile #define USE_ADVANCED_SCRIPT_DEBUG_OUTPUT #define SCRIPT_LOG_FILE_LEVEL 0 // 0 == no log, 1 == overwrite every frame, 2 == full log diff --git a/src/core/main.cpp b/src/core/main.cpp index 21643e0..d44fe99 100644 --- a/src/core/main.cpp +++ b/src/core/main.cpp @@ -1403,10 +1403,10 @@ RenderScene(void) } #endif PUSH_RENDERGROUP("RenderScene"); - CClouds::Render(); +// CClouds::Render(); DoRWRenderHorizon(); CRenderer::RenderRoads(); - CCoronas::RenderReflections(); +// CCoronas::RenderReflections(); RwRenderStateSet(rwRENDERSTATEFOGENABLE, (void*)TRUE); CRenderer::RenderEverythingBarRoads(); CRenderer::RenderBoats(); @@ -1416,7 +1416,7 @@ RenderScene(void) #ifndef SQUEEZE_PERFORMANCE CRenderer::RenderVehiclesButNotBoats(); #endif - CWeather::RenderRainStreaks(); +// CWeather::RenderRainStreaks(); POP_RENDERGROUP(); } diff --git a/src/renderer/SpecialFX.cpp b/src/renderer/SpecialFX.cpp index 6d96d21..4f4e4a0 100644 --- a/src/renderer/SpecialFX.cpp +++ b/src/renderer/SpecialFX.cpp @@ -137,10 +137,10 @@ void CSpecialFX::Render(void) { PUSH_RENDERGROUP("CSpecialFX::Render"); - CMotionBlurStreaks::Render(); +// CMotionBlurStreaks::Render(); CBulletTraces::Render(); - CBrightLights::Render(); - CShinyTexts::Render(); +// CBrightLights::Render(); +// CShinyTexts::Render(); CMoneyMessages::Render(); #ifdef NEW_RENDERER if(!(gbNewRenderer && FredIsInFirstPersonCam())) diff --git a/src/skel/symbian/symbian.cpp b/src/skel/symbian/symbian.cpp index a07a202..b8f38ae 100644 --- a/src/skel/symbian/symbian.cpp +++ b/src/skel/symbian/symbian.cpp @@ -96,7 +96,6 @@ static bool spinning; bool qwerty; bool touch; bool moreVram; -bool powervr; void _InputTranslateShiftKeyUpDown(RsKeyCodes *rs) { } @@ -575,17 +574,6 @@ public: eglMakeCurrent(eglDisplay, eglSurface, eglSurface, eglContext); - const char* renderer = (const char *)glGetString(GL_RENDERER); - if (strstr(renderer, "MBX") || strstr(renderer, "SGX")) { - // use pvrtc - powervr = true; - } else if (strstr(renderer, "VideoCore")) { - // use etc1 - } else { - User::Leave(KErrNotSupported); - return; - } - setlocale(LC_ALL, ""); setlocale(LC_CTYPE, "C"); setlocale(LC_COLLATE, "C"); diff --git a/vendor/librw/src/gl/gl3immed.cpp b/vendor/librw/src/gl/gl3immed.cpp index 8eaa827..1619f23 100644 --- a/vendor/librw/src/gl/gl3immed.cpp +++ b/vendor/librw/src/gl/gl3immed.cpp @@ -118,11 +118,6 @@ im2DRenderPrimitive(PrimitiveType primType, void *vertices, int32 numVertices) glEnableVertexAttribArray(ATTRIB_TEXCOORDS0); glVertexAttribPointer(ATTRIB_TEXCOORDS0, 2, GL_FLOAT, GL_FALSE, sizeof(Im2DVertex), (uint8*)vertices + OFFSET_OF(Im2DVertex, u)); - glDisableVertexAttribArray(ATTRIB_NORMAL); - glDisableVertexAttribArray(ATTRIB_WEIGHTS); - glDisableVertexAttribArray(ATTRIB_INDICES); - glDisableVertexAttribArray(ATTRIB_TEXCOORDS1); - glDrawArrays(primTypeMap[primType], 0, numVertices); glDisableVertexAttribArray(ATTRIB_POS); @@ -156,11 +151,6 @@ im2DRenderIndexedPrimitive(PrimitiveType primType, glEnableVertexAttribArray(ATTRIB_TEXCOORDS0); glVertexAttribPointer(ATTRIB_TEXCOORDS0, 2, GL_FLOAT, GL_FALSE, sizeof(Im2DVertex), (uint8*)vertices + OFFSET_OF(Im2DVertex, u)); - glDisableVertexAttribArray(ATTRIB_NORMAL); - glDisableVertexAttribArray(ATTRIB_WEIGHTS); - glDisableVertexAttribArray(ATTRIB_INDICES); - glDisableVertexAttribArray(ATTRIB_TEXCOORDS1); - glDrawElements(primTypeMap[primType], numIndices, GL_UNSIGNED_SHORT, indices); glDisableVertexAttribArray(ATTRIB_POS); @@ -231,11 +221,6 @@ im3DRenderPrimitive(PrimitiveType primType) glEnableVertexAttribArray(ATTRIB_TEXCOORDS0); glVertexAttribPointer(ATTRIB_TEXCOORDS0, 2, GL_FLOAT, GL_FALSE, sizeof(Im3DVertex), (uint8*)currentIm3dVertices + OFFSET_OF(Im3DVertex, u)); - glDisableVertexAttribArray(ATTRIB_NORMAL); - glDisableVertexAttribArray(ATTRIB_WEIGHTS); - glDisableVertexAttribArray(ATTRIB_INDICES); - glDisableVertexAttribArray(ATTRIB_TEXCOORDS1); - glDrawArrays(primTypeMap[primType], 0, num3DVertices); glDisableVertexAttribArray(ATTRIB_POS); @@ -260,11 +245,6 @@ im3DRenderIndexedPrimitive(PrimitiveType primType, void *indices, int32 numIndic glEnableVertexAttribArray(ATTRIB_TEXCOORDS0); glVertexAttribPointer(ATTRIB_TEXCOORDS0, 2, GL_FLOAT, GL_FALSE, sizeof(Im3DVertex), (uint8*)currentIm3dVertices + OFFSET_OF(Im3DVertex, u)); - glDisableVertexAttribArray(ATTRIB_NORMAL); - glDisableVertexAttribArray(ATTRIB_WEIGHTS); - glDisableVertexAttribArray(ATTRIB_INDICES); - glDisableVertexAttribArray(ATTRIB_TEXCOORDS1); - glDrawElements(primTypeMap[primType], numIndices, GL_UNSIGNED_SHORT, indices); glDisableVertexAttribArray(ATTRIB_POS); diff --git a/vendor/librw/src/gl/gl3shader.cpp b/vendor/librw/src/gl/gl3shader.cpp index c217a85..5e37304 100644 --- a/vendor/librw/src/gl/gl3shader.cpp +++ b/vendor/librw/src/gl/gl3shader.cpp @@ -189,13 +189,8 @@ compileshader(GLenum type, const char **src, GLuint *shader) glShaderSource(shdr, n, src, nil); glCompileShader(shdr); glGetShaderiv(shdr, GL_COMPILE_STATUS, &success); -#ifdef _DEBUG printShaderSource(src); -#endif if(!success){ -#ifndef _DEBUG - printShaderSource(src); -#endif fprintf(stderr, "Error in %s shader\n", type == GL_VERTEX_SHADER ? "vertex" : "fragment"); glGetShaderiv(shdr, GL_INFO_LOG_LENGTH, &len); diff --git a/vendor/librw/src/gl/gl3skin.cpp b/vendor/librw/src/gl/gl3skin.cpp index a3dbeee..8c626d7 100644 --- a/vendor/librw/src/gl/gl3skin.cpp +++ b/vendor/librw/src/gl/gl3skin.cpp @@ -342,6 +342,7 @@ skinClose(void *o, int32, int32) void initSkin(void) { + if (moreVram) return; // TODO u_boneMatrices = registerUniform("u_boneMatrices", UNIFORM_MAT4, MAX_BONES); Driver::registerPlugin(PLATFORM_GL3, 0, ID_SKIN, diff --git a/vendor/librw/src/gl/shaders/skin.vert b/vendor/librw/src/gl/shaders/skin.vert index 65e8595..1092d85 100644 --- a/vendor/librw/src/gl/shaders/skin.vert +++ b/vendor/librw/src/gl/shaders/skin.vert @@ -13,7 +13,7 @@ main(void) SkinVertex += (u_boneMatrices[int(in_indices.x)] * vec4(in_pos, 1.0)).xyz * in_weights.x; SkinVertex += (u_boneMatrices[int(in_indices.y)] * vec4(in_pos, 1.0)).xyz * in_weights.y; SkinVertex += (u_boneMatrices[int(in_indices.z)] * vec4(in_pos, 1.0)).xyz * in_weights.z; - //SkinVertex += (u_boneMatrices[int(in_indices.w)] * vec4(in_pos, 1.0)).xyz * in_weights.w; + SkinVertex += (u_boneMatrices[int(in_indices.w)] * vec4(in_pos, 1.0)).xyz * in_weights.w; vec4 Vertex = u_world * vec4(SkinVertex, 1.0); gl_Position = u_proj * u_view * Vertex; diff --git a/vendor/librw/src/gl/shaders/skin_gl.inc b/vendor/librw/src/gl/shaders/skin_gl.inc index ab7115a..21f13d7 100644 --- a/vendor/librw/src/gl/shaders/skin_gl.inc +++ b/vendor/librw/src/gl/shaders/skin_gl.inc @@ -14,7 +14,7 @@ const char *skin_vert_src = " SkinVertex += (u_boneMatrices[int(in_indices.x)] * vec4(in_pos, 1.0)).xyz * in_weights.x;\n" " SkinVertex += (u_boneMatrices[int(in_indices.y)] * vec4(in_pos, 1.0)).xyz * in_weights.y;\n" " SkinVertex += (u_boneMatrices[int(in_indices.z)] * vec4(in_pos, 1.0)).xyz * in_weights.z;\n" -" //SkinVertex += (u_boneMatrices[int(in_indices.w)] * vec4(in_pos, 1.0)).xyz * in_weights.w;\n" +" SkinVertex += (u_boneMatrices[int(in_indices.w)] * vec4(in_pos, 1.0)).xyz * in_weights.w;\n" " vec4 Vertex = u_world * vec4(SkinVertex, 1.0);\n" " gl_Position = u_proj * u_view * Vertex;\n" diff --git a/vendor/librw/src/printf_stub.c b/vendor/librw/src/printf_stub.c deleted file mode 100644 index 04df7e5..0000000 --- a/vendor/librw/src/printf_stub.c +++ /dev/null @@ -1,11 +0,0 @@ -#ifndef _DEBUG -#include - -int printf(const char * __restrict s, ...) { - return 0; -} - -int puts(const char *s) { - return 0; -} -#endif