Commit graph

973 commits

Author SHA1 Message Date
strmnnrmn
6a11f5a4d4 [~] Rename gTextureMemory to gPaletteMemory
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1277 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-12 20:53:05 +00:00
strmnnrmn
a20512169b [~] Fix an assert in DLParser_S2DEX_ObjLoadTxtr
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1276 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-12 20:52:58 +00:00
strmnnrmn
4c7520b103 [~] Give DoConversion a better name - ConvertTexture
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1275 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-12 20:52:51 +00:00
strmnnrmn
a3ebd92100 [~] Tidy ConvertTexture.cpp - drop the p_ prefixes and give vars consistent names throughout
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1274 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-12 20:52:44 +00:00
strmnnrmn
5fed5d198d [~] Liney uppy
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1273 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-12 20:52:37 +00:00
strmnnrmn
fbbd913457 [~] Tidy ConvertImage.cpp
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1272 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-12 20:52:31 +00:00
strmnnrmn
2c32785b8b [~] Move the logic for gConversionTable lokups to ConvertTexture.cpp
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1271 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-12 20:52:24 +00:00
strmnnrmn
928b5b75bd [~] Move SelectNativeFormat to the top of the file
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1270 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-12 20:52:17 +00:00
strmnnrmn
088cfd061b [~] Move Clamp/Recolour/Mirror functions out of CachedTexture.cpp and into a separate TextureTransform.cpp
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1269 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-12 20:52:11 +00:00
strmnnrmn
0d11586c30 [~] Simplify CachedTexture::Initialise
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1268 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-12 20:52:03 +00:00
strmnnrmn
5fe227b674 [~] Move DumpTexture to the end of the file.
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1267 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-12 20:51:56 +00:00
strmnnrmn
9b55ada0a7 [~] GetSystemMemoryUsage and GetVideoMemoryUsage are unused.
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1266 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-12 20:51:50 +00:00
strmnnrmn
19f1c4d9b8 [~] Fix a warning about palette being redefined.
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1265 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-12 20:51:39 +00:00
strmnnrmn
4218e19f5c [~] Tidy TextureInfo a little
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1264 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-12 20:51:32 +00:00
strmnnrmn
b9ac9a12f0 [~] Move TextureInfo::SelectNativeFormat to be a free function in TextureCache.cpp. I want to push this closer to the NativeTexture creation/update so that different platforms can easily override (e.g. OSX can just create RGBA8888 textures.)
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1263 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-12 20:51:26 +00:00
strmnnrmn
b92deba504 [~] Update TextureInfo.h header guard to match filename
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1262 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-12 20:51:18 +00:00
strmnnrmn
c82743aedb [~] Rename CTextureCache::GetTexture to GetOrCreateTexture (more greppable). PAss a TextureInfo reference instead of a pointer
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1261 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-12 20:51:11 +00:00
strmnnrmn
062e7b40a0 [~] Improve the '0 width/height' assert slightly
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1259 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-12 20:50:55 +00:00
strmnnrmn
96de19a570 [*] Rename TextureDecriptor.{h,cpp} to TextureInfo (match the class name)
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1258 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-12 20:50:48 +00:00
strmnnrmn
a3eee1f6cb [~] CTextureCache doesn't really need to be a pimpl - remove this to avoid a few virtual calls. Remove lots of unused code and tidy.
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1257 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-12 20:50:36 +00:00
strmnnrmn
ad60c4e0e3 [-] Nuke unused DLParser_DL_Process.
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1256 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-12 20:50:24 +00:00
strmnnrmn
9dce522006 [~] CachedTexture::GetTexture should never return NULL, I think
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1255 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-12 20:50:17 +00:00
strmnnrmn
7b711b84f8 [~] Reduce UpdateTileSnapshot nesting a little.
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1254 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-12 20:50:11 +00:00
strmnnrmn
b1f7834620 [~] Simplify UpdateTileSnapshot a little. Move the T1 hack out into a separate function.
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1253 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-12 20:50:04 +00:00
salvy
c2f9a55f3c [~] Fixed Tigger's Honey Hunt
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1252 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-12 06:11:46 +00:00
salvy
ff44ce2c0e [!] Some clean ups to deprecate poking the projection stack, and some other small clean ups
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1251 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-10 22:50:41 +00:00
strmnnrmn
e9d7d8fd1f [~] Clang caught this - SetProjectionDKR uses mProjectionStack[4], so need at least 5 elements for this array.
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1250 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-10 19:01:50 +00:00
strmnnrmn
058c7de6b5 [~] Rename CTexture to CachedTexture
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1249 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-10 19:01:41 +00:00
strmnnrmn
079b8315da [~] Tidy Texture a little - GetRecolouredTexture only ever called with c32::White, so remove the arg and rename GetWhiteTexture. UpdateTexture doesn't need to be a member, so make a static function at global scope.
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1248 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-10 19:01:22 +00:00
strmnnrmn
4535293604 [~] Add SImageDescriptor::GetPitch16bpp. Also, not sure what the assert in GetPitch is actually checking for?
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1247 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-10 19:01:12 +00:00
strmnnrmn
c5157ad905 [~] Add a GetAddress16bpp function to SImageDescriptor
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1246 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-10 19:01:04 +00:00
strmnnrmn
c14dcab870 [~] Rename gTextureMemory to gTlutLoadAddresses when DAEDALUS_FAST_TMEM is set
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1245 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-10 19:00:56 +00:00
strmnnrmn
9ed2880959 [~] Fix assert when running without DAEDALUS_FAST_TMEM
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1244 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-10 19:00:44 +00:00
salvy
8df469af4c [~] Clean ups to previous commit
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1236 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-10 16:30:28 +00:00
salvy
88ba769ea0 [!] The projection mat stack is 1 matrix deep, so it cannot be popped/pushed.
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1235 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-10 11:06:58 +00:00
strmnnrmn
28f63547e9 [~] Implement the MatrixMultiply functions on non-PSP platforms, and remove a bunch of ifdefs.
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1221 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-09 14:00:38 +00:00
strmnnrmn
4958e15f0d [~] Move the WorldProject code to a function
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1220 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-09 14:00:30 +00:00
strmnnrmn
41c91d9549 [~] Rename EnableTexturing (which doesn't do any enabling) to UpdateTileSnapshots
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1219 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-09 14:00:22 +00:00
strmnnrmn
8f4dcdffc7 [~] Fix viewports and scissoring with OpenGL - 'y' is from the bottom of the screen, not the top. Also, tidy SetPSPViewport - it's basically just InitViewport - and avoid a redundant call to UpdateViewport (called from both SetPSPViewport and SetN64Viewport)
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1216 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-09 13:59:57 +00:00
strmnnrmn
87ab04454c [~] Move the texture setup code from FlushTris to RenderTriangles. That moves some of the last state changes in BaseRenderer to the platform impls. I deleted the GU_CULL_FACE code - we can just rely on the software culling in AddTri.
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1215 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-09 13:59:49 +00:00
strmnnrmn
5da4d13f43 [~] Valid_Entry -> mValidEntryBits
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1214 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-09 13:59:37 +00:00
strmnnrmn
129b1db8ae [~] Mode DLDebug_DumpRDPOtherMode to DLDebug.cpp
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1213 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-09 13:59:29 +00:00
strmnnrmn
00042f8c20 [~] Change RDP.h typedef structs to structs (easier to forward declare)
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1212 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-09 13:59:21 +00:00
strmnnrmn
3afdce3310 [~] Rename RDP_SetOtherMode to DLDebug_DumpRDPOtherMode, and make it use the passed arguments
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1211 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-09 13:59:13 +00:00
salvy
e571e5fca2 [!] Finally fixed SSV cut scenes and glitch when walking by the windshield of the ship \o/
[~] Reverted changes to rom write support, no need to over think it since it works fine as it is

git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1210 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-09 07:43:45 +00:00
salvy
c21a6a3f56 [~] Removed outer round from ConvertN64ToScreen (I think we had issues before because we were using the vfpu round)
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1206 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-07 17:19:53 +00:00
strmnnrmn
9ee820d32c [~] Add a TODO for the rounding in ConvertN64ToScreen
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1205 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-06 21:09:07 +00:00
strmnnrmn
f2cd817ae8 [~] mN64ToNative{Scale,Translate} -> mN64ToScreen{Scale,Translate}
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1204 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-06 21:09:00 +00:00
strmnnrmn
e82f23491e [~] N64ToNative{X,Y} -> N64ToScreen{X,Y}
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1203 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-06 21:08:52 +00:00
strmnnrmn
b0e75da33c [~] Rename ConvertN64ToPsp to ConvertN64ToScreen (going to add a ToDisplay version next)
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1202 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-06 21:08:42 +00:00