MGislv/GLideN64
1
0
Fork 0
mirror of https://github.com/blawar/GLideN64.git synced 2024-07-02 09:03:37 +00:00
Code Issues Projects Releases Wiki Activity

Implement ucode for Kuiki Uhabi Suigo.

Browse Source 
Fixed Kuiki Uhabi Suigo: missing graphics in HLE #665
This commit is contained in:
Sergey Lipskiy 2016-12-09 11:40:49 +07:00
parent 737442b1eb
commit f2ee42b64e
8 changed files with 139 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
projects/msvc12/GLideN64.vcxproj
View File

@ -280,6 +280,7 @@
<ClCompile Include="..\..\src\DepthBufferRender\ClipPolygon.cpp" />
<ClCompile Include="..\..\src\DepthBufferRender\DepthBufferRender.cpp" />
<ClCompile Include="..\..\src\F3DEX2CBFD.cpp" />
<ClCompile Include="..\..\src\F3DSETA.cpp" />
<ClCompile Include="..\..\src\F3DSWSE.cpp" />
<ClCompile Include="..\..\src\FBOTextureFormats.cpp" />
<ClCompile Include="..\..\src\FrameBuffer.cpp" />
@ -397,6 +398,7 @@
<ClInclude Include="..\..\src\DepthBufferRender\ClipPolygon.h" />
<ClInclude Include="..\..\src\DepthBufferRender\DepthBufferRender.h" />
<ClInclude Include="..\..\src\F3DEX2CBFD.h" />
<ClInclude Include="..\..\src\F3DSETA.h" />
<ClInclude Include="..\..\src\F3DSWSE.h" />
<ClInclude Include="..\..\src\FBOTextureFormats.h" />
<ClInclude Include="..\..\src\FrameBuffer.h" />

6
projects/msvc12/GLideN64.vcxproj.filters
View File

@ -260,6 +260,9 @@
<ClCompile Include="..\..\src\BufferCopy\ColorBufferToRDRAM_BufferStorageExt.cpp">
<Filter>Source Files\BufferCopy</Filter>
</ClCompile>
<ClCompile Include="..\..\src\F3DSETA.cpp">
<Filter>Source Files\uCodes</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\src\3DMath.h">
@ -463,5 +466,8 @@
<ClInclude Include="..\..\src\BufferCopy\ColorBufferToRDRAM_GL.h">
<Filter>Header Files\BufferCopy</Filter>
</ClInclude>
<ClInclude Include="..\..\src\F3DSETA.h">
<Filter>Header Files\uCodes</Filter>
</ClInclude>
</ItemGroup>
</Project>

1
src/CMakeLists.txt
View File

@ -20,6 +20,7 @@ set(GLideN64_SOURCES
F3DPD.cpp
F3DWRUS.cpp
F3DSWSE.cpp
F3DSETA.cpp
F3DEX2.cpp
F3DEX2CBFD.cpp
FBOTextureFormats.cpp

114
src/F3DSETA.cpp Normal file
View File

@ -0,0 +1,114 @@
#include <assert.h>
#include "GLideN64.h"
#include "Debug.h"
#include "F3D.h"
#include "F3DSETA.h"
#include "N64.h"
#include "RSP.h"
#include "RDP.h"
#include "gSP.h"
#include "gDP.h"
#include "GBI.h"
#define F3DSETA_PERSPNORM 0xB4
#define F3DSETA_RDPHALF_1 0xB3
#define F3DSETA_RDPHALF_2 0xB2
#define F3DSETA_RDPHALF_CONT 0xB1
#define F3DSETA_MW_NUMLIGHT 0x00
#define F3DSETA_MW_CLIP 0x02
#define F3DSETA_MW_SEGMENT 0x04
#define F3DSETA_MW_FOG 0x06
#define F3DSETA_MW_LIGHTCOL 0x08
void F3DSETA_MoveWord(u32 w0, u32 w1)
{
switch (_SHIFTR( w0, 8, 8 )) {
case F3DSETA_MW_NUMLIGHT:
gSPNumLights( ((w1 - 0x80000000) >> 5) - 1 );
break;
case F3DSETA_MW_CLIP:
gSPClipRatio( w1 );
break;
case F3DSETA_MW_SEGMENT:
gSPSegment( _SHIFTR( w0, 10, 4 ), w1 & 0x00FFFFFF );
break;
case F3DSETA_MW_FOG:
gSPFogFactor( (s16)_SHIFTR( w1, 16, 16 ), (s16)_SHIFTR( w1, 0, 16 ) );
break;
case F3DSETA_MW_LIGHTCOL:
switch (_SHIFTR( w0, 0, 8 ))
{
case F3D_MWO_aLIGHT_1:
gSPLightColor( LIGHT_1, w1 );
break;
case F3D_MWO_aLIGHT_2:
gSPLightColor( LIGHT_2, w1 );
break;
case F3D_MWO_aLIGHT_3:
gSPLightColor( LIGHT_3, w1 );
break;
case F3D_MWO_aLIGHT_4:
gSPLightColor( LIGHT_4, w1 );
break;
case F3D_MWO_aLIGHT_5:
gSPLightColor( LIGHT_5, w1 );
break;
case F3D_MWO_aLIGHT_6:
gSPLightColor( LIGHT_6, w1 );
break;
case F3D_MWO_aLIGHT_7:
gSPLightColor( LIGHT_7, w1 );
break;
case F3D_MWO_aLIGHT_8:
gSPLightColor( LIGHT_8, w1 );
break;
}
break;
default:
assert(false && "F3DSETA unknown MoveWord");
}
}
void F3DSETA_Perpnorm(u32 w0, u32 w1)
{
gSPPerspNormalize(w1);
}
void F3DSETA_Init()
{
gSPSetupFunctions();
// Set GeometryMode flags
GBI_InitFlags( F3D );
GBI.PCStackSize = 10;
// GBI Command Command Value Command Function
GBI_SetGBI( G_SPNOOP, F3D_SPNOOP, F3D_SPNoOp );
GBI_SetGBI( G_MTX, F3D_MTX, F3D_Mtx );
GBI_SetGBI( G_RESERVED0, F3D_RESERVED0, F3D_Reserved0 );
GBI_SetGBI( G_MOVEMEM, F3D_MOVEMEM, F3D_MoveMem );
GBI_SetGBI( G_VTX, F3D_VTX, F3D_Vtx );
GBI_SetGBI( G_RESERVED1, F3D_RESERVED1, F3D_Reserved1 );
GBI_SetGBI( G_DL, F3D_DL, F3D_DList );
GBI_SetGBI( G_RESERVED2, F3D_RESERVED2, F3D_Reserved2 );
GBI_SetGBI( G_RESERVED3, F3D_RESERVED3, F3D_Reserved3 );
GBI_SetGBI( G_SPRITE2D_BASE, F3D_SPRITE2D_BASE, F3D_Sprite2D_Base );
GBI_SetGBI( G_TRI1, F3D_TRI1, F3D_Tri1 );
GBI_SetGBI( G_CULLDL, F3D_CULLDL, F3D_CullDL );
GBI_SetGBI( G_POPMTX, F3D_POPMTX, F3D_PopMtx );
GBI_SetGBI( G_MOVEWORD, F3D_MOVEWORD, F3DSETA_MoveWord );
GBI_SetGBI( G_PERSPNORM, F3DSETA_PERSPNORM, F3DSETA_Perpnorm);
GBI_SetGBI( G_TEXTURE, F3D_TEXTURE, F3D_Texture );
GBI_SetGBI( G_SETOTHERMODE_H, F3D_SETOTHERMODE_H, F3D_SetOtherMode_H );
GBI_SetGBI( G_SETOTHERMODE_L, F3D_SETOTHERMODE_L, F3D_SetOtherMode_L );
GBI_SetGBI( G_ENDDL, F3D_ENDDL, F3D_EndDL );
GBI_SetGBI( G_SETGEOMETRYMODE, F3D_SETGEOMETRYMODE, F3D_SetGeometryMode );
GBI_SetGBI( G_CLEARGEOMETRYMODE, F3D_CLEARGEOMETRYMODE, F3D_ClearGeometryMode );
GBI_SetGBI( G_QUAD, F3D_QUAD, F3D_Quad );
GBI_SetGBI( G_RDPHALF_1, F3DSETA_RDPHALF_1, F3D_RDPHalf_1 );
GBI_SetGBI( G_RDPHALF_2, F3DSETA_RDPHALF_2, F3D_RDPHalf_2 );
GBI_SetGBI( G_RDPHALF_CONT, F3DSETA_RDPHALF_CONT, F3D_RDPHalf_Cont );
GBI_SetGBI( G_TRI4, F3D_TRI4, F3D_Tri4 );
}

7
src/F3DSETA.h Normal file
View File

@ -0,0 +1,7 @@
#ifndef F3DSETA_H
#define F3DSETA_H
void F3DSETA_Init();
#endif

6
src/GBI.cpp
View File

@ -22,6 +22,7 @@
#include "F3DSWSE.h"
#include "F3DWRUS.h"
#include "F3DPD.h"
#include "F3DSETA.h"
#include "F3DEX2CBFD.h"
#include "ZSort.h"
#include "CRC.h"
@ -35,10 +36,10 @@ SpecialMicrocodeInfo specialMicrocodes[] =
{
{ F3D, false, 0xe62a706d, "Fast3D" },
{ F3D, false, 0x7d372819, "Fast3D" },
{ F3D, false, 0x2edee7be, "Fast3D" },
{ F3D, false, 0xe01e14be, "Fast3D" },
{ F3D, false, 0x4AED6B3B, "Fast3D" }, //Vivid Dolls [ALECK64]
{ F3DSETA, false, 0x2edee7be, "RSP SW Version: 2.0D, 04-01-96" },
{ F3DWRUS, false, 0xd17906e2, "RSP SW Version: 2.0D, 04-01-96" },
{ F3DSWSE, false, 0x94c4c833, "RSP SW Version: 2.0D, 04-01-96" },
{ F3DEX, true, 0x637b4b58, "RSP SW Version: 2.0D, 04-01-96" },
@ -76,6 +77,8 @@ u32 G_OBJ_RECTANGLE, G_OBJ_SPRITE, G_OBJ_MOVEMEM;
u32 G_SELECT_DL, G_OBJ_RENDERMODE, G_OBJ_RECTANGLE_R;
u32 G_OBJ_LOADTXTR, G_OBJ_LDTX_SPRITE, G_OBJ_LDTX_RECT, G_OBJ_LDTX_RECT_R;
u32 G_RDPHALF_0;
u32 G_PERSPNORM;
u32 G_MTX_STACKSIZE;
u32 G_MTX_MODELVIEW;
@ -181,6 +184,7 @@ void GBIInfo::_makeCurrent(MicrocodeInfo * _pCurrent)
case Turbo3D: F3D_Init(); break;
case ZSortp: ZSort_Init(); break;
case F3DEX2CBFD:F3DEX2CBFD_Init(); break;
case F3DSETA: F3DSETA_Init(); break;
}
#ifndef GLESX

4
src/GBI.h
View File

@ -22,7 +22,8 @@
#define F3DEX2CBFD 13
#define Turbo3D 14
#define ZSortp 15
#define NONE 16
#define F3DSETA 16
#define NONE 17
// Fixed point conversion factors
#define FIXED2FLOATRECIP1 0.5f
@ -595,6 +596,7 @@ extern u32 G_OBJ_RECTANGLE, G_OBJ_SPRITE, G_OBJ_MOVEMEM;
extern u32 G_SELECT_DL, G_OBJ_RENDERMODE, G_OBJ_RECTANGLE_R;
extern u32 G_OBJ_LOADTXTR, G_OBJ_LDTX_SPRITE, G_OBJ_LDTX_RECT, G_OBJ_LDTX_RECT_R;
extern u32 G_RDPHALF_0;
extern u32 G_PERSPNORM;
#define LIGHT_1 1
#define LIGHT_2 2

1
src/mupen64plus-video-gliden64.mk
View File

@ -37,6 +37,7 @@ MY_LOCAL_SRC_FILES := \
$(SRCDIR)/F3DEX.cpp \
$(SRCDIR)/F3DPD.cpp \
$(SRCDIR)/F3DSWSE.cpp \
$(SRCDIR)/F3DSETA.cpp \
$(SRCDIR)/F3DWRUS.cpp \
$(SRCDIR)/FBOTextureFormats.cpp \
$(SRCDIR)/FrameBuffer.cpp \