Commit graph

152 commits

Author SHA1 Message Date
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
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
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
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
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
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
strmnnrmn
f18fa4001d [~] Replace RenderUsingCurrentBuildMode virtual with RenderTriangles. The triangle_mode/render_mode args don't need to be passed then, which simplifies the interfaces a bit. On OSX we can get rid of ERenderMode and just pass the matrix to use. On PSP we just pass GU_TRANSFORM_3D/2D as we did previously.
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1201 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-06 21:08:32 +00:00
strmnnrmn
d099a4cb1b [~] Pass an enum to RenderUsingCurrentBlendMode to specify 2d/3d rendering. This lets us remove a bunch more dummy enum values on OSX
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1187 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-06 21:06:37 +00:00
strmnnrmn
b89c9c3844 [~] More OCD liney-uppy :)
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1185 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-06 21:06:17 +00:00
strmnnrmn
3e2ba77637 [~] Rename matWorld/matProject vars to mat_world, mat_project
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1184 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-06 21:06:09 +00:00
strmnnrmn
a7595a6749 [~] Move mat_world_project variable declaration after chunk of code which modifies mWorldProject (functionally equivalent as it's a reference, but a bit more clear that mat_world_project reflects the changes
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1183 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-06 21:06:02 +00:00
strmnnrmn
8fc0f527d4 [~] Rename GetWorldProject to UpdateWorldProject, which is a bit clearer about what it's doing. Also, as it just returns a ref to mWorldProject, just return void and reference this member directly from the calling code. Finally, rename matWorldProject -> mat_world_project
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1182 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-06 21:05:55 +00:00
strmnnrmn
10510911ba [~] The VFPU and C versions of SetNewVertexInfo passed different args to sceGuSetMatrix. They're equivalent (both reference the same thing) but it's worth keeping the code consistent
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1181 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-06 21:05:47 +00:00
strmnnrmn
bf912598ba [~] Remove some old commented out zfighting hack
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1178 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-05 20:28:11 +00:00
strmnnrmn
094d561623 [~] Move TexRect/TexRectFlip/FillRect to the platform renderer implementations - stuff like GU_SPRITES makes the OSX implementation a bit bodgy.
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1175 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-05 20:27:43 +00:00
strmnnrmn
4c1ce8b38c [~] Move ConvertN64ToPsp to the BaseRenderer header. I'm about to move texrect etc to the platform implementations, and it won't be visible to inline from there.
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1173 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-05 20:27:25 +00:00
strmnnrmn
313e1af02a [~] Compile fix for psp
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1168 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-05 20:26:41 +00:00
strmnnrmn
e57fc132c6 [~] Rewrite SetScissor for OSX. Remove sceGuScissor dummy function.
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1166 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-05 20:26:26 +00:00
strmnnrmn
1aa6f9771a [~] Rewrite UpdateViewport for OSX. Remove sceGuViewport and sceGuOffset dummy functions
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1165 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-05 20:26:16 +00:00
salvy
c00e93dd8d [~] Clean up unnecessary headers and lib
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1164 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-04 18:47:00 +00:00
strmnnrmn
c8e7fef486 [!] sceGuTexWrap needs to be called in the OverrideFunction path
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1161 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-03 23:06:09 +00:00
salvy
444a12c3ce [!] Removed checks to avoid necessary viewport update from BeginScene (Is only called once per frame andyways)
[!] Enable memory access opt for LB (Mario 64 doesn't crash anymore with it, still risky, small speed up, let me know if any game stops working with mem opt option)

git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1157 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-03 22:20:47 +00:00
strmnnrmn
a6ce923525 [*] CHECK THIS PLEASE :) I think the call to sceGuTexWrap in EnableTexturing is unnecessary - it's always called immediately before sceGuDrawArray in RendererPSP::RenderUsingRenderSettings
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1149 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-03 22:13:15 +00:00
strmnnrmn
07c7b5b974 [~] Make RestoreRenderStates platform specific.
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1144 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-03 22:12:31 +00:00
strmnnrmn
9ba738f2a0 [~] Tidy
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1142 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-03 22:12:12 +00:00
strmnnrmn
3aaa1cda8e [~] Nicer vertex allocation for OSX - no longer uses sceGuGetMemory dummy function
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1140 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-03 22:11:56 +00:00
strmnnrmn
3133c86d54 [~] Fix indentation
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1139 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-03 22:11:49 +00:00
strmnnrmn
98f4a75241 [~] Add a coule of FIXMEs for zbuffer differences between TextRect, TexRectFlip and FillRect
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1138 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-03 22:11:42 +00:00
strmnnrmn
7bbc5a7a39 [~] Rename mN64ToPSP* to mN64ToNative* and wrap the duplicated transform in an inline function.
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1137 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-03 22:11:35 +00:00
strmnnrmn
2ae5974061 [~] Move mUnhandledCombinerStates to the PSP renderer.
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1135 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-03 22:11:18 +00:00
strmnnrmn
b32b50b2e5 [~] Move placeholder texture stuff to the PSP renderer.
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1134 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-03 22:11:08 +00:00
strmnnrmn
1f52aaa0bc [~] Move BlendConstant.{h,cpp} and RenderSettings.{h,cpp} to SysPSP
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1132 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-03 12:32:10 +00:00
strmnnrmn
311f69151d [~] mCopyBlendStates/mFillBlendStates are only used by the PSP renderer
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1131 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-03 12:31:56 +00:00
strmnnrmn
53a69a2c1f [*] Move BlendModes.{h,cpp}, CombinerExpression.{h,cpp} CombinerTree.{h,cpp} and CombinerInput.h to SysPSP. These aren't needed to compile the OSX build any more.
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1129 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-03 12:08:00 +00:00
strmnnrmn
5f4df61c5a [~] Move LookupBlendState to the PSP Renderer implementation
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1128 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-03 12:07:43 +00:00
strmnnrmn
9230c125e6 [~] Move some PSP specific debugging code to RendererPSP
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1127 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-03 12:07:35 +00:00
strmnnrmn
daaab70972 [~] Shouldn't TexRect and TextRectFlip use the same logic to generate screen coords? TexRectFlip is use by Wetrix's intro screens
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1121 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-03 12:06:38 +00:00
strmnnrmn
fc88fe8410 [~] Rename some members with a m_dw prefix
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1120 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-03 12:06:31 +00:00
strmnnrmn
ebc7fb07c4 [~] Add a couple of notes to check UV offsets in the texrect code
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1119 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-03 12:06:23 +00:00
strmnnrmn
29155d7e01 [~] Move DrawTexture functions from BaseRenderer to the platform-specific impls
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1116 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-03 12:06:01 +00:00
strmnnrmn
05a3fe11d3 [~] Fix whitespace
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1115 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-03 12:05:52 +00:00
strmnnrmn
cc4fa6e600 [~] Make RenderUsingCurrentBlendMode pure virtual and define in the PSP/OSX implementations. Move RenderUsingRenderSettings too. The OSX build can pretty much rewrite all of this code, which I'll do next.
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1111 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-03 12:05:18 +00:00