From a259b6b8ab7124b68bbc0f0b80c5560a672a502a Mon Sep 17 00:00:00 2001 From: Sergeanur Date: Mon, 23 Nov 2020 22:46:07 +0200 Subject: TexturePools # Conflicts: # src/core/Game.cpp # src/rw/RwHelper.cpp --- src/rw/RwHelper.cpp | 7 ------- 1 file changed, 7 deletions(-) (limited to 'src/rw/RwHelper.cpp') diff --git a/src/rw/RwHelper.cpp b/src/rw/RwHelper.cpp index 4c4fc434..7d62a01c 100644 --- a/src/rw/RwHelper.cpp +++ b/src/rw/RwHelper.cpp @@ -727,13 +727,6 @@ CameraCreate(RwInt32 width, RwInt32 height, RwBool zBuffer) return (nil); } -#ifdef USE_TEXTURE_POOL -WRAPPER void _TexturePoolsInitialise() { EAXJMP(0x6271E0); } -WRAPPER void _TexturePoolsShutdown() { EAXJMP(0x627080); } -WRAPPER void _TexturePoolsFinalShutdown() { EAXJMP(0x626F80); } -WRAPPER void _TexturePoolsUnknown(bool) { EAXJMP(0x626F70); } -#endif - #ifdef LIBRW #include #include "VehicleModelInfo.h" -- cgit v1.2.3 From f3a356375e084caf50eed38b06ca6885d2d92b9d Mon Sep 17 00:00:00 2001 From: aap Date: Fri, 18 Dec 2020 14:19:03 +0100 Subject: added MemoryHeap from III, MemoryMgr --- src/rw/RwHelper.cpp | 39 --------------------------------------- 1 file changed, 39 deletions(-) (limited to 'src/rw/RwHelper.cpp') diff --git a/src/rw/RwHelper.cpp b/src/rw/RwHelper.cpp index 7d62a01c..8e41cdc9 100644 --- a/src/rw/RwHelper.cpp +++ b/src/rw/RwHelper.cpp @@ -63,45 +63,6 @@ void FlushObrsPrintfs() #endif } -void * -RwMallocAlign(RwUInt32 size, RwUInt32 align) -{ -#ifdef FIX_BUGS - uintptr ptralign = align-1; - void *mem = (void *)malloc(size + sizeof(uintptr) + ptralign); - - ASSERT(mem != nil); - - void *addr = (void *)((((uintptr)mem) + sizeof(uintptr) + ptralign) & ~ptralign); - - ASSERT(addr != nil); -#else - void *mem = (void *)malloc(size + align); - - ASSERT(mem != nil); - - void *addr = (void *)((((uintptr)mem) + align) & ~(align - 1)); - - ASSERT(addr != nil); -#endif - - *(((void **)addr) - 1) = mem; - - return addr; -} - -void -RwFreeAlign(void *mem) -{ - ASSERT(mem != nil); - - void *addr = *(((void **)mem) - 1); - - ASSERT(addr != nil); - - free(addr); -} - void DefinedState(void) { -- cgit v1.2.3 From 57098a77eca98fba609d649c0f6f9715e6e7a79a Mon Sep 17 00:00:00 2001 From: erorcun Date: Sat, 26 Dec 2020 12:10:04 +0300 Subject: Backface cull. in INI, mouse sensitivity fix, aspect ratio auto as default --- src/rw/RwHelper.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/rw/RwHelper.cpp') diff --git a/src/rw/RwHelper.cpp b/src/rw/RwHelper.cpp index 8e41cdc9..2591a6dc 100644 --- a/src/rw/RwHelper.cpp +++ b/src/rw/RwHelper.cpp @@ -18,7 +18,7 @@ bool gPS2alphaTest = true; #else bool gPS2alphaTest = false; #endif -bool gBackfaceCulling; +bool gBackfaceCulling = true; #if !defined(FINAL) || defined(DEBUGMENU) static bool charsetOpen; -- cgit v1.2.3 From b9e97ab79db84785838f1b995188c37328c26071 Mon Sep 17 00:00:00 2001 From: Sergeanur Date: Tue, 29 Dec 2020 13:55:26 +0200 Subject: Reorder CEntity functions into their original order --- src/rw/RwHelper.cpp | 20 -------------------- 1 file changed, 20 deletions(-) (limited to 'src/rw/RwHelper.cpp') diff --git a/src/rw/RwHelper.cpp b/src/rw/RwHelper.cpp index 2591a6dc..cab3b68c 100644 --- a/src/rw/RwHelper.cpp +++ b/src/rw/RwHelper.cpp @@ -289,26 +289,6 @@ HAnimAnimationCreateForHierarchy(RpHAnimHierarchy *hier) return anim; } -RpAtomic* -AtomicRemoveAnimFromSkinCB(RpAtomic *atomic, void *data) -{ - if(RpSkinGeometryGetSkin(RpAtomicGetGeometry(atomic))){ - RpHAnimHierarchy *hier = RpSkinAtomicGetHAnimHierarchy(atomic); -#ifdef LIBRW - if(hier && hier->interpolator->currentAnim){ - RpHAnimAnimationDestroy(hier->interpolator->currentAnim); - hier->interpolator->currentAnim = nil; - } -#else - if(hier && hier->currentAnim){ - RpHAnimAnimationDestroy(hier->currentAnim->pCurrentAnim); - hier->currentAnim = nil; - } -#endif - } - return atomic; -} - void RenderSkeleton(RpHAnimHierarchy *hier) { -- cgit v1.2.3