Commit graph

143 commits

Author SHA1 Message Date
strmnnrmn
6a10ac65f5 [*] Pass integer texture coords through to TexRect and TexRectFlip. For OpenGL, the shader now also passes the texture offset/scale as integer args
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1531 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-04-07 11:29:02 +00:00
strmnnrmn
b359dc1c1f [~] Remove mAlphaThreshold - this is just the blend colour alpha
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1527 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-04-07 11:28:31 +00:00
strmnnrmn
df8cb86d4d [~] Use stdint.h for all types.
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1520 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-04-05 09:23:02 +00:00
strmnnrmn
ae6a33fb87 [~] Don't bother storing mTexShift - just look it up using mActiveTile index as needed
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1515 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-04-05 09:17:13 +00:00
strmnnrmn
8b1e304f22 [!] Fix texrect on Super Smash Bros
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1510 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-04-04 10:49:58 +00:00
strmnnrmn
9c83d36e2e [~] Keep track of which tile is bound to slot 0/1
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1509 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-04-04 10:49:51 +00:00
strmnnrmn
82486a7f25 [!] Fix Zelda spinny N intro - T1 textures were being loaded with dimensions of 32x0, 1x32 etc
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1507 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-04-04 10:49:37 +00:00
salvy
f808f72cee [~} More clean ups
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1491 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-31 04:52:43 +00:00
strmnnrmn
be4b36f0b4 [~] Move FillColour and BlendColour to BaseRenderer. Going to use these in the dLDebugger
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1488 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-30 15:11:34 +00:00
strmnnrmn
53891779bf [~] Rename MAX_VERTICES to kMaxIndices. Rename m_swIndexBuffer to mIndexBuffer.
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1477 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-30 10:20:49 +00:00
strmnnrmn
6776cc0d9e [!] Fix a broken assert in AddTris
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1476 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-30 10:20:42 +00:00
strmnnrmn
ed1fdd8f5e [~] Change some construction init to assignment init (functionally equivalent, but allows for a bit more whitespace around the variable name, which improves readability)
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1475 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-30 10:20:36 +00:00
strmnnrmn
654f79cad9 [~] Rename MAX_VERTS to kMaxN64Vertices
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1474 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-30 10:20:29 +00:00
strmnnrmn
2b84834976 [~] Rename NUM_N64_TEXTURES to kNumBoundTextures
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1473 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-30 10:20:23 +00:00
salvy
0f60eae933 [!] Started WIP to get rendering working from GL renderer (some textures show up now, ex texrect!)
[!] Compiled project as console app (needed for glfw) [WIP, ALOT things got broken! and huge clean up is needed, will fix them eventually)
Note: glew and glfw are now needed to build W32.

git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1443 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-26 21:58:22 +00:00
salvy
c8ac6af830 [!] Fixes to to get OSX (GL rendering) to work under W32
Note: libpng15 is now needed to compile W32 build

git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1442 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-26 16:18:21 +00:00
strmnnrmn
01e95dc42e [~] Ugh, fix bad unstash
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1388 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-24 12:52:46 +00:00
strmnnrmn
6dd19cd062 [+] Get Texel1 working on OSX
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1382 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-24 12:51:57 +00:00
strmnnrmn
5d744e459c [+] Implement the tile shift_s/shift_t on OSX. Should be possible to get this working on PSP too, but it doesn't always make things look better without Texel1 too
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1380 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-24 12:51:40 +00:00
strmnnrmn
ccd4f66711 [~] Keep track of prim lod fraction
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1376 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-24 12:51:12 +00:00
strmnnrmn
dfe90f3258 [~] Tidy SImageDescriptor bits
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1370 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-24 12:50:26 +00:00
strmnnrmn
759314e347 [!] Fix Cruisin USA - ModifyVertexInfo args were transposed
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1368 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-23 02:00:59 +00:00
strmnnrmn
a7b569ac71 [!] Fix PrepareTexRectUVs - it was applying GU_CLAMP when uv0.{x,y} was already >0, but uv1.{x,y} was <0 or >size
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1356 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-21 22:16:51 +00:00
Corn
f2d0f4cd0f [!] Force Clamp for textures on texrects (and use a hack to disable it on Lamborghini)
[!] Fix off by one in UV mapping for texrects (california speed)

git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1354 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-21 19:20:09 +00:00
strmnnrmn
50bbb7bb1c [~] Fix a small texrect uv issue - if the uv1 x/y is outside of bounds, don't force clamping (all the offseting should be fine)
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1350 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-20 01:00:19 +00:00
strmnnrmn
f8d4b4d190 [!] Fix glitchy borders in TexRect. Use GU_CLAMP/GL_CLAMP_TO_EDGE, but only after fixing up UVs so that they're positive.
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1348 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-20 00:42:24 +00:00
strmnnrmn
b7486694f9 [~] Pass S2DEX/Sprite2D texture loads through the renderer so that it can keep track of what's loaded
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1344 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-20 00:41:51 +00:00
strmnnrmn
e068c9da98 [~] Rename mRecentTexture* to mBoundTexture*
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1325 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-20 00:39:41 +00:00
strmnnrmn
648d139117 [~] Not we can move the code to set up mRecentTexture earlier (hopefully into RDPStateManager::GetUpdatedTextureDescriptor
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1324 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-20 00:39:33 +00:00
strmnnrmn
7e9a6f8eb0 [*] Remove mTileScale. No need to cache this, as we can always figure it out from the native texture (less state to keep in sync is better)
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1323 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-20 00:39:27 +00:00
strmnnrmn
575bc9fd2e [~] Rename GetTextureDescriptor to GetUpdatedTextureDescriptor, and remove mutable
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1320 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-20 00:39:04 +00:00
strmnnrmn
231b248979 [~] CTextureCache::GetOrCreateTexture can return a CNativeTexture now.
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1314 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-20 00:38:17 +00:00
strmnnrmn
af29743eab [~] Keep track of NativeTextures, not CachedTextures. I'm going to introduce a new CachedTile type for OSX, and it's simpler for the renderer to only know about the native texture type (common to CachedTexture and CachedTile)
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1313 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-20 00:38:09 +00:00
strmnnrmn
f0c89b1874 [~] Make CachedTexture::UpdateIfNecessary private. Always do this when returning from CTextureCache::GetOrCreateTexture (the mFrameLastUsed check in IsFresh ensure that this does nothing if called many times in a frame)
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1311 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-20 00:37:50 +00:00
salvy
dcde132975 [~] I don't know why aligning a local variable for mat didn't work well, use a global for now..
[~] Fixed debug build

git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1302 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-18 07:42:21 +00:00
Corn
68b1060f33 [!] Improved matrix handling for DKR (skipping the need for some globals)
[!] Reduced the stack to a single matrix for project matrices 
[!] Made some viewport stuff OSX only

git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1300 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-16 21:37:39 +00:00
salvy
942fda9c4a [!] Use a temp mat when multiplying matrices..We could overflow since we were using the next stack slot for storage which mMatStackSize aware, also gcc gives better asm using a local variable :)
git-svn-id: https://subversion.assembla.com/svn/Daedalusx64/trunk@1299 42e9bfbe-799a-4a2d-bad1-236e862a387a
2013-03-15 02:29: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
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
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