ShuriZma
/
desmume
mirror of https://github.com/TASEmulators/desmume.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use cast instead of implicit conversion in rasterize.cpp. 

Taken from ldesnogue's patch at #2752961.
This commit is contained in:
riccardom 2009-05-04 19:13:57 +00:00
parent 2bf05b75fb
commit fbbe9da5ef
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
desmume/src/rasterize.cpp
View File

@ -306,8 +306,8 @@ static struct Sampler
{ {
//finally, we can use floor here. but, it is slower than we want. //finally, we can use floor here. but, it is slower than we want.
//the best solution is probably to wait until the pipeline is full of fixed point //the best solution is probably to wait until the pipeline is full of fixed point
int iu = floorf(u); int iu = (int)floorf(u);
int iv = floorf(v); int iv = (int)floorf(v);
dowrap(iu,iv); dowrap(iu,iv);
FragmentColor color; FragmentColor color;
@ -446,12 +446,12 @@ static FORCEINLINE void pixel(int adr,float r, float g, float b, float invu, flo
if(gfx3d.wbuffer) { if(gfx3d.wbuffer) {
//not sure about this //not sure about this
//this value was chosen to make the skybox, castle window decals, and water level render correctly in SM64 //this value was chosen to make the skybox, castle window decals, and water level render correctly in SM64
depth = (4096*w); depth = (u32)(4096*w);
} }
else else
{ {
//depth = fastFloor(z*0x7FFF)>>8; //depth = fastFloor(z*0x7FFF)>>8;
depth = z*0x7FFF; depth = (u32)(z*0x7FFF);
//depth = z*0xFFFFFF; //depth = z*0xFFFFFF;
} }
if(polyAttr.decalMode) if(polyAttr.decalMode)
@ -623,13 +623,13 @@ inline void FloorDivMod(long Numerator, long Denominator, long &Floor, long &Mod
} }
inline fixed28_4 FloatToFixed28_4( float Value ) { inline fixed28_4 FloatToFixed28_4( float Value ) {
return Value * 16; return (fixed28_4)(Value * 16);
} }
inline float Fixed28_4ToFloat( fixed28_4 Value ) { inline float Fixed28_4ToFloat( fixed28_4 Value ) {
return Value / 16.0; return Value / 16.0;
} }
//inline fixed16_16 FloatToFixed16_16( float Value ) { //inline fixed16_16 FloatToFixed16_16( float Value ) {
// return Value * 65536; // return (fixed16_6)(Value * 65536);
//} //}
//inline float Fixed16_16ToFloat( fixed16_16 Value ) { //inline float Fixed16_16ToFloat( fixed16_16 Value ) {
// return Value / 65536.0; // return Value / 65536.0;
@ -691,8 +691,8 @@ FORCEINLINE edge_fx_fl::edge_fx_fl(int Top, int Bottom) {
if(Height) if(Height)
{ {
long dN = verts[Bottom]->y - verts[Top]->y; long dN = long(verts[Bottom]->y - verts[Top]->y);
long dM = verts[Bottom]->x - verts[Top]->x; long dM = long(verts[Bottom]->x - verts[Top]->x);
long InitialNumerator = dM*16*Y - dM*verts[Top]->y + dN*verts[Top]->x - 1 + dN*16; long InitialNumerator = dM*16*Y - dM*verts[Top]->y + dN*verts[Top]->x - 1 + dN*16;
FloorDivMod(InitialNumerator,dN*16,X,ErrorTerm); FloorDivMod(InitialNumerator,dN*16,X,ErrorTerm);