williamjcm/small3dlib
1
0
Fork 0
mirror of https://git.coom.tech/drummyfish/small3dlib.git synced 2024-11-21 20:39:57 +01:00
Code Activity

Refactor a bit

Browse source
This commit is contained in:
Miloslav Číž 2019-06-11 15:45:50 +02:00
parent 3a29d4c679
commit cbd7d50e0e
2 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
programs/demo.c
View file

@ -12,9 +12,9 @@
#define S3L_FLAT 0 #define S3L_FLAT 0
#define S3L_STRICT_NEAR_CULLING 0 #define S3L_STRICT_NEAR_CULLING 0
#define S3L_PERSPECTIVE_CORRECTION 2 #define S3L_PERSPECTIVE_CORRECTION 2
#define S3L_SORT 2 #define S3L_SORT 0
#define S3L_STENCIL_BUFFER 1 #define S3L_STENCIL_BUFFER 0
#define S3L_Z_BUFFER 0 #define S3L_Z_BUFFER 1
#define S3L_PIXEL_FUNCTION drawPixel #define S3L_PIXEL_FUNCTION drawPixel

23
small3dlib.h
View file

@ -472,7 +472,7 @@ static inline void S3L_initPixelInfo(S3L_PixelInfo *p);
conditions (each fall into <0,S3L_FRACTIONS_PER_UNIT>, sum = conditions (each fall into <0,S3L_FRACTIONS_PER_UNIT>, sum =
S3L_FRACTIONS_PER_UNIT). Note that doing this per-pixel can slow the program S3L_FRACTIONS_PER_UNIT). Note that doing this per-pixel can slow the program
down significantly. */ down significantly. */
static inline void S3LcorrectBarycentricCoords(S3L_Unit barycentric[3]); static inline void S3L_correctBarycentricCoords(S3L_Unit barycentric[3]);
// general helper functions // general helper functions
static inline S3L_Unit S3L_abs(S3L_Unit value); static inline S3L_Unit S3L_abs(S3L_Unit value);
@ -555,8 +555,6 @@ void S3L_drawTriangle(
S3L_Vec4 point0, S3L_Vec4 point0,
S3L_Vec4 point1, S3L_Vec4 point1,
S3L_Vec4 point2, S3L_Vec4 point2,
const S3L_DrawConfig *config,
const S3L_Camera *camera,
S3L_Index modelIndex, S3L_Index modelIndex,
S3L_Index triangleIndex); S3L_Index triangleIndex);
@ -631,6 +629,8 @@ static inline void S3L_rotate2DPoint(S3L_Unit *x, S3L_Unit *y, S3L_Unit angle);
//============================================================================= //=============================================================================
// privates // privates
#define S3L_UNUSED(what) (void)(what) ///< helper macro for unused vars
#define S3L_HALF_RESOLUTION_X (S3L_RESOLUTION_X >> 1) #define S3L_HALF_RESOLUTION_X (S3L_RESOLUTION_X >> 1)
#define S3L_HALF_RESOLUTION_Y (S3L_RESOLUTION_Y >> 1) #define S3L_HALF_RESOLUTION_Y (S3L_RESOLUTION_Y >> 1)
@ -674,6 +674,9 @@ S3L_Unit S3L_zBufferRead(S3L_ScreenCoord x, S3L_ScreenCoord y)
#if S3L_Z_BUFFER #if S3L_Z_BUFFER
return S3L_zBuffer[y * S3L_RESOLUTION_X + x]; return S3L_zBuffer[y * S3L_RESOLUTION_X + x];
#else #else
S3L_UNUSED(x);
S3L_UNUSED(y);
return 0; return 0;
#endif #endif
} }
@ -682,6 +685,10 @@ void S3L_zBufferWrite(S3L_ScreenCoord x, S3L_ScreenCoord y, S3L_Unit value)
{ {
#if S3L_Z_BUFFER #if S3L_Z_BUFFER
S3L_zBuffer[y * S3L_RESOLUTION_X + x] = value; S3L_zBuffer[y * S3L_RESOLUTION_X + x] = value;
#else
S3L_UNUSED(x);
S3L_UNUSED(y);
S3L_UNUSED(value);
#endif #endif
} }
@ -1593,8 +1600,6 @@ void S3L_drawTriangle(
S3L_Vec4 point0, S3L_Vec4 point0,
S3L_Vec4 point1, S3L_Vec4 point1,
S3L_Vec4 point2, S3L_Vec4 point2,
const S3L_DrawConfig *config,
const S3L_Camera *camera,
S3L_Index modelIndex, S3L_Index modelIndex,
S3L_Index triangleIndex) S3L_Index triangleIndex)
{ {
@ -2324,8 +2329,8 @@ void S3L_drawScene(S3L_Scene scene)
{ {
#if S3L_SORT == 0 #if S3L_SORT == 0
// without sorting draw right away // without sorting draw right away
S3L_drawTriangle(transformed0,transformed1,transformed2, S3L_drawTriangle(transformed0,transformed1,transformed2,modelIndex,
&(model->config),&(scene.camera),modelIndex,triangleIndex); triangleIndex);
#else #else
if (S3L_sortArrayLength >= S3L_MAX_TRIANGES_DRAWN) if (S3L_sortArrayLength >= S3L_MAX_TRIANGES_DRAWN)
break; break;
@ -2406,8 +2411,8 @@ void S3L_drawScene(S3L_Scene scene)
_S3L_projectVertex(model,triangleIndex,2,&matFinal, _S3L_projectVertex(model,triangleIndex,2,&matFinal,
&transformed2,scene.camera.focalLength); &transformed2,scene.camera.focalLength);
S3L_drawTriangle(transformed0,transformed1,transformed2, S3L_drawTriangle(transformed0,transformed1,transformed2,modelIndex,
&(model->config),&(scene.camera),modelIndex,triangleIndex); triangleIndex);
} }
#endif #endif
} }