RI_SetValue, material flags (implemented wireframe, double sided, and has texture)

readme.md

@@ -72,7 +72,7 @@ Rasterizer + Iver = RasterIver
 - [ ] allow objects to have no texture
 - [ ] make checks for objects trying to have a texture, but no UV coords (generate them?)
 - [x] FOV
-- [ ] add materials
+- [x] add materials
 - [x] make another kernel that calculated transforms & perspective before rasterizing
 - [ ] add ability to request objects multiple times 
 - [ ] give objects IDs or some way to track them so that you can remove them dynamically

src/RasterIver/headers/object.h

@@ -10,10 +10,13 @@ typedef struct __attribute__((aligned(4))) {
     cl_uchar b; // 1
 } ColorARGB; // size: 4, align: 4
 
-typedef struct __attribute__((aligned(8))) {
+typedef struct __attribute__((aligned(4))) {
     ColorARGB albedo;     // 4
     cl_int textureOffset; // 4
-} Material; // size 8, align: 4
+    cl_int normalMapOffset; // 4
+    cl_int bumpMapOffset; // 4
+    cl_ulong properties; // 8
+} Material; // size 24
 
 typedef struct __attribute__((aligned(16))) {
     cl_float x; // 4
@@ -33,7 +36,7 @@ typedef struct __attribute__((aligned(16))) {
     Vec3 position;  // 16 bytes
     Vec3 scale;     // 16 bytes
     Vec4 rotation;  // 16 bytes
-} Transform; // size: 48 bytes (actually 64 because 3x16)
+} Transform; // size: 48 bytes
 
 typedef struct __attribute__((aligned(4))) {
     cl_int transformedVertexOffset;

src/RasterIver/headers/rasteriver.h

@@ -9,6 +9,7 @@
 
 typedef int RI_result;
 typedef int RI_flag;
+typedef int RI_value;
 typedef uint32_t RI_uint;
 typedef float* RI_polygons;
 typedef float* RI_verticies;
@@ -39,6 +40,7 @@ typedef unsigned char* RI_textures;
 
 typedef struct {
     float x, y, z, r_x, r_y, r_z, r_w, s_x, s_y, s_z;
+    uint64_t material_flags;
     char file_path[40];
     char texture[40];
 } RI_newObject;
@@ -54,6 +56,7 @@ typedef enum {
     RI_NOT_RUNNING  = -2,
     RI_RUNNING      =  1,
     RI_INVALID_FLAG = -3,
+    RI_INVALID_VALUE = -4,
 } RI_result_enum;
 
 // RI_flag
@@ -74,6 +77,10 @@ typedef enum {
     RI_FLAG_HANDLE_SDL_EVENTS   = 13,
 } RI_flag_enum;
 
+typedef enum {
+    RI_VALUE_WIREFRAME_SCALE = 0,
+} RI_value_enum;
+
 // RI_BUFFER
 typedef enum {
     RI_BUFFER_COMPLETE  = 0,
@@ -89,11 +96,29 @@ typedef enum {
     RI_DEBUG_HIGH     = 2,
 } RI_debug_enum;
 
-// RI_VALUE
+typedef enum {
+    RI_MATERIAL_UNLIT = ((uint64_t)1 << 0), // should calculate lighting
+    RI_MATERIAL_DONT_CAST_SHADOW = ((uint64_t)1 << 1), // should cast shadow on other objects
+    RI_MATERIAL_HAS_TEXTURE = ((uint64_t)1 << 2), // has a texture
+    RI_MATERIAL_HAS_NORMAL_MAP = ((uint64_t)1 << 3), // has a normal map
+    RI_MATERIAL_HAS_BUMP_MAP = ((uint64_t)1 << 4), // has a bump map
+    RI_MATERIAL_TRANSPARENT = ((uint64_t)1 << 5), // has transparency
+    RI_MATERIAL_WIREFRAME = ((uint64_t)1 << 6), // render as wireframe
+    RI_MATERIAL_DONT_RECEIVE_SHADOW = ((uint64_t)1 << 7), // should shadows render on it
+    RI_MATERIAL_DONT_DEPTH_TEST = ((uint64_t)1 << 8), // should check Z buffer (if 1, render on top of everything)
+    RI_MATERIAL_DONT_DEPTH_WRITE = ((uint64_t)1 << 9), // should write to the Z buffer (if 1, render behind everything)
+    RI_MATERIAL_DOUBLE_SIDED = ((uint64_t)1 << 10), // ignore backface culling
+} RI_material_properties_enum;
+
+typedef enum {
+    RI_PMP_TEXTURED = RI_MATERIAL_HAS_TEXTURE,
+} RI_preset_material_properties;
+
+// RI_BOOL
 typedef enum {
     RI_TRUE      = 1,
     RI_FALSE   = 0,
-} RI_value_enum;
+} RI_bool_enum;
 
 // Initializes OpenCL, SDL2, and anything else Rasteriver needs to function
 RI_result   RI_Init();
@@ -125,6 +150,9 @@ RI_result   RI_ShowZBuffer(int RI_ShowZBufferFlag);
 // Sets a flag
 RI_result   RI_SetFlag(RI_flag RI_FlagToSet, int RI_Value);
 
+// Sets a value
+RI_result   RI_SetValue(RI_value RI_ValueToSet, float RI_Value);
+
 // Sets the FPS limit
 RI_result   RI_SetFpsCap(int RI_FpsCap);
 

src/RasterIver/kernels/master_kernel.h

@@ -25,7 +25,10 @@ typedef struct {\
 \
 typedef struct {\
     ColorARGB albedo;\
-    int textureOffset;\
+    cl_int textureOffset;\
+    cl_int normalMapOffset;\
+    cl_int bumpMapOffset;\
+    cl_ulong properties;\
 } Material;\
 \
 typedef struct {\

src/RasterIver/kernels/transformer.h

@@ -25,7 +25,10 @@ typedef struct {\
 \
 typedef struct {\
     ColorARGB albedo;\
-    int textureOffset;\
+    cl_int textureOffset;\
+    cl_int normalMapOffset;\
+    cl_int bumpMapOffset;\
+    cl_ulong properties;\
 } Material;\
 \
 typedef struct {\

src/launch program/main.c

@@ -3,8 +3,8 @@
 #include <time.h>
 #include <stdlib.h>
 
-int width = 800;
-int height = 800;
+int width = 100;
+int height = 100;
 
 int main(){ 
     srand(time(NULL));                                                         
@@ -23,6 +23,8 @@ int main(){
     RI_SetFlag(RI_FLAG_SHOW_INFO, 0);
     RI_SetFlag(RI_FLAG_USE_CPU, 0);
 
+    RI_SetValue(RI_VALUE_WIREFRAME_SCALE, 0.02);
+
     char prefix[50] = "[RASTERIVER IS AMAZING] ";
     RI_SetDebugPrefix(prefix);
     //RI_SetFpsCap(120);
@@ -32,58 +34,58 @@ int main(){
     }
 
     RI_newObject object_buffer[49] = {
-        {0, 0, 100,          0, 0, 0, -9999999,          10, 10, 10,        "objects/rotated_cube.obj", "textures/bill_mcdinner.png"},
-        {10, 0, 100,        0, 0, 0, -9999999,          10, 10, 10,         "objects/rotated_cube.obj", "textures/bill_mcdinner.png"},
-        {20, 0, 100,         0, 0, 0, -9999999,          10, 10, 10,        "objects/rotated_cube.obj", "textures/bill_mcdinner.png"},
-        {30, 0, 100,       0, 0, 0, -9999999,          10, 10, 10,          "objects/rotated_cube.obj", "textures/bill_mcdinner.png"},
-        {-10, 0, 100,       0, 0, 0, -9999999,          10, 10, 10,         "objects/rotated_cube.obj", "textures/bill_mcdinner.png"},
-        {-20, 0, 100,       0, 0, 0, -9999999,          10, 10, 10,         "objects/rotated_cube.obj", "textures/bill_mcdinner.png"},
-        {-30, 0, 100,          0, 0, 0, -9999999,          10, 10, 10,      "objects/rotated_cube.obj", "textures/bill_mcdinner.png"},
-        {0, 10, 100,          0, 0, 0, -9999999,          10, 10, 10,       "objects/rotated_cube.obj", "textures/bill_mcdinner.png"},
-        {10, 10, 100,        0, 0, 0, -9999999,          10, 10, 10,        "objects/rotated_cube.obj", "textures/bill_mcdinner.png"},
-        {20, 10, 100,         0, 0, 0, -9999999,          10, 10, 10,       "objects/rotated_cube.obj", "textures/bill_mcdinner.png"},
-        {30, 10, 100,       0, 0, 0, -9999999,          10, 10, 10,         "objects/rotated_cube.obj", "textures/bill_mcdinner.png"},
-        {-10, 10, 100,       0, 0, 0, -9999999,          10, 10, 10,        "objects/rotated_cube.obj", "textures/bill_mcdinner.png"},
-        {-20, 10, 100,       0, 0, 0, -9999999,          10, 10, 10,        "objects/rotated_cube.obj", "textures/bill_mcdinner.png"},
-        {-30, 10, 100,          0, 0, 0, -9999999,          10, 10, 10,     "objects/rotated_cube.obj", "textures/bill_mcdinner.png"},
-        {0, -10, 100,          0, 0, 0, -9999999,          10, 10, 10,      "objects/rotated_cube.obj", "textures/bill_mcdinner.png"},
-        {10, -10, 100,        0, 0, 0, -9999999,          10, 10, 10,       "objects/rotated_cube.obj", "textures/bill_mcdinner.png"},
-        {20, -10, 100,         0, 0, 0, -9999999,          10, 10, 10,      "objects/rotated_cube.obj", "textures/bill_mcdinner.png"},
-        {30, -10, 100,       0, 0, 0, -9999999,          10, 10, 10,        "objects/rotated_cube.obj", "textures/bill_mcdinner.png"},
-        {-10, -10, 100,       0, 0, 0, -9999999,          10, 10, 10,       "objects/rotated_cube.obj", "textures/bill_mcdinner.png"},
-        {-20, -10, 100,       0, 0, 0, -9999999,          10, 10, 10,       "objects/rotated_cube.obj", "textures/bill_mcdinner.png"},
-        {-30, -10, 100,          0, 0, 0, -9999999,          10, 10, 10,    "objects/rotated_cube.obj", "textures/bill_mcdinner.png"},
-        {0, 20, 100,          0, 0, 0, -9999999,          10, 10, 10,       "objects/rotated_cube.obj", "textures/bill_mcdinner.png"},
-        {10, 20, 100,        0, 0, 0, -9999999,          10, 10, 10,        "objects/rotated_cube.obj", "textures/bill_mcdinner.png"},
-        {20, 20, 100,         0, 0, 0, -9999999,          10, 10, 10,       "objects/rotated_cube.obj", "textures/bill_mcdinner.png"},
-        {30, 20, 100,       0, 0, 0, -9999999,          10, 10, 10,         "objects/rotated_cube.obj", "textures/bill_mcdinner.png"},
-        {-10, 20, 100,       0, 0, 0, -9999999,          10, 10, 10,        "objects/rotated_cube.obj", "textures/bill_mcdinner.png"},
-        {-20, 20, 100,       0, 0, 0, -9999999,          10, 10, 10,        "objects/rotated_cube.obj", "textures/bill_mcdinner.png"},
-        {-30, 20, 100,          0, 0, 0, -9999999,          10, 10, 10,     "objects/rotated_cube.obj", "textures/bill_mcdinner.png"},
-        {0, -20, 100,          0, 0, 0, -9999999,          10, 10, 10,      "objects/rotated_cube.obj", "textures/bill_mcdinner.png"},
-        {10, -20, 100,        0, 0, 0, -9999999,          10, 10, 10,       "objects/rotated_cube.obj", "textures/bill_mcdinner.png"},
-        {20, -20, 100,         0, 0, 0, -9999999,          10, 10, 10,      "objects/rotated_cube.obj", "textures/bill_mcdinner.png"},
-        {30, -20, 100,       0, 0, 0, -9999999,          10, 10, 10,        "objects/rotated_cube.obj", "textures/bill_mcdinner.png"},
-        {-10, -20, 100,       0, 0, 0, -9999999,          10, 10, 10,       "objects/rotated_cube.obj", "textures/bill_mcdinner.png"},
-        {-20, -20, 100,       0, 0, 0, -9999999,          10, 10, 10,       "objects/rotated_cube.obj", "textures/bill_mcdinner.png"},
-        {-30, -20, 100,          0, 0, 0, -9999999,          10, 10, 10,    "objects/rotated_cube.obj", "textures/bill_mcdinner.png"},
-        {0, 30, 100,          0, 0, 0, -9999999,          10, 10, 10,       "objects/rotated_cube.obj", "textures/bill_mcdinner.png"},
-        {10, 30, 100,        0, 0, 0, -9999999,          10, 10, 10,        "objects/rotated_cube.obj", "textures/bill_mcdinner.png"},
-        {20, 30, 100,         0, 0, 0, -9999999,          10, 10, 10,       "objects/rotated_cube.obj", "textures/bill_mcdinner.png"},
-        {30, 30, 100,       0, 0, 0, -9999999,          10, 10, 10,         "objects/rotated_cube.obj", "textures/bill_mcdinner.png"},
-        {-10, 30, 100,       0, 0, 0, -9999999,          10, 10, 10,        "objects/rotated_cube.obj", "textures/bill_mcdinner.png"},
-        {-20, 30, 100,       0, 0, 0, -9999999,          10, 10, 10,        "objects/rotated_cube.obj", "textures/bill_mcdinner.png"},
-        {-30, 30, 100,          0, 0, 0, -9999999,          10, 10, 10,     "objects/rotated_cube.obj", "textures/bill_mcdinner.png"},
-        {0, -30, 100,          0, 0, 0, -9999999,          10, 10, 10,      "objects/rotated_cube.obj", "textures/bill_mcdinner.png"},
-        {10, -30, 100,        0, 0, 0, -9999999,          10, 10, 10,       "objects/rotated_cube.obj", "textures/bill_mcdinner.png"},
-        {20, -30, 100,         0, 0, 0, -9999999,          10, 10, 10,      "objects/rotated_cube.obj", "textures/bill_mcdinner.png"},
-        {30, -30, 100,       0, 0, 0, -9999999,          10, 10, 10,        "objects/rotated_cube.obj", "textures/bill_mcdinner.png"},
-        {-10, -30, 100,       0, 0, 0, -9999999,          10, 10, 10,       "objects/rotated_cube.obj", "textures/bill_mcdinner.png"},
-        {-20, -30, 100,       0, 0, 0, -9999999,          10, 10, 10,       "objects/rotated_cube.obj", "textures/bill_mcdinner.png"},
-        {-30, -30, 100,          0, 0, 0, -9999999,          10, 10, 10,    "objects/rotated_cube.obj", "textures/bill_mcdinner.png"},
+        {0, 0, 50,          0, 0, 0, -9999999,          10, 10, 10,        RI_MATERIAL_WIREFRAME | RI_MATERIAL_DOUBLE_SIDED | RI_MATERIAL_HAS_TEXTURE, "objects/rotated_cube.obj", "textures/bill_mcdinner.png"},
+        {10, 0, 100,        0, 0, 0, -9999999,          10, 10, 10,         RI_PMP_TEXTURED, "objects/rotated_cube.obj", "textures/bill_mcdinner.png"},
+        {20, 0, 100,         0, 0, 0, -9999999,          10, 10, 10,        RI_PMP_TEXTURED, "objects/rotated_cube.obj", "textures/bill_mcdinner.png"},
+        {30, 0, 100,       0, 0, 0, -9999999,          10, 10, 10,          RI_PMP_TEXTURED, "objects/rotated_cube.obj", "textures/bill_mcdinner.png"},
+        {-10, 0, 100,       0, 0, 0, -9999999,          10, 10, 10,         RI_PMP_TEXTURED, "objects/rotated_cube.obj", "textures/bill_mcdinner.png"},
+        {-20, 0, 100,       0, 0, 0, -9999999,          10, 10, 10,         RI_PMP_TEXTURED, "objects/rotated_cube.obj", "textures/bill_mcdinner.png"},
+        {-30, 0, 100,          0, 0, 0, -9999999,          10, 10, 10,      RI_PMP_TEXTURED, "objects/rotated_cube.obj", "textures/bill_mcdinner.png"},
+        {0, 10, 100,          0, 0, 0, -9999999,          10, 10, 10,       RI_PMP_TEXTURED, "objects/rotated_cube.obj", "textures/bill_mcdinner.png"},
+        {10, 10, 100,        0, 0, 0, -9999999,          10, 10, 10,        RI_PMP_TEXTURED, "objects/rotated_cube.obj", "textures/bill_mcdinner.png"},
+        {20, 10, 100,         0, 0, 0, -9999999,          10, 10, 10,       RI_PMP_TEXTURED, "objects/rotated_cube.obj", "textures/bill_mcdinner.png"},
+        {30, 10, 100,       0, 0, 0, -9999999,          10, 10, 10,         RI_PMP_TEXTURED, "objects/rotated_cube.obj", "textures/bill_mcdinner.png"},
+        {-10, 10, 100,       0, 0, 0, -9999999,          10, 10, 10,        RI_PMP_TEXTURED, "objects/rotated_cube.obj", "textures/bill_mcdinner.png"},
+        {-20, 10, 100,       0, 0, 0, -9999999,          10, 10, 10,        RI_PMP_TEXTURED, "objects/rotated_cube.obj", "textures/bill_mcdinner.png"},
+        {-30, 10, 100,          0, 0, 0, -9999999,          10, 10, 10,     RI_PMP_TEXTURED, "objects/rotated_cube.obj", "textures/bill_mcdinner.png"},
+        {0, -10, 100,          0, 0, 0, -9999999,          10, 10, 10,      RI_PMP_TEXTURED, "objects/rotated_cube.obj", "textures/bill_mcdinner.png"},
+        {10, -10, 100,        0, 0, 0, -9999999,          10, 10, 10,       RI_PMP_TEXTURED, "objects/rotated_cube.obj", "textures/bill_mcdinner.png"},
+        {20, -10, 100,         0, 0, 0, -9999999,          10, 10, 10,      RI_PMP_TEXTURED, "objects/rotated_cube.obj", "textures/bill_mcdinner.png"},
+        {30, -10, 100,       0, 0, 0, -9999999,          10, 10, 10,        RI_PMP_TEXTURED, "objects/rotated_cube.obj", "textures/bill_mcdinner.png"},
+        {-10, -10, 100,       0, 0, 0, -9999999,          10, 10, 10,       RI_PMP_TEXTURED, "objects/rotated_cube.obj", "textures/bill_mcdinner.png"},
+        {-20, -10, 100,       0, 0, 0, -9999999,          10, 10, 10,       RI_PMP_TEXTURED, "objects/rotated_cube.obj", "textures/bill_mcdinner.png"},
+        {-30, -10, 100,          0, 0, 0, -9999999,          10, 10, 10,    RI_PMP_TEXTURED, "objects/rotated_cube.obj", "textures/bill_mcdinner.png"},
+        {0, 20, 100,          0, 0, 0, -9999999,          10, 10, 10,       RI_PMP_TEXTURED, "objects/rotated_cube.obj", "textures/bill_mcdinner.png"},
+        {10, 20, 100,        0, 0, 0, -9999999,          10, 10, 10,        RI_PMP_TEXTURED, "objects/rotated_cube.obj", "textures/bill_mcdinner.png"},
+        {20, 20, 100,         0, 0, 0, -9999999,          10, 10, 10,       RI_PMP_TEXTURED, "objects/rotated_cube.obj", "textures/bill_mcdinner.png"},
+        {30, 20, 100,       0, 0, 0, -9999999,          10, 10, 10,         RI_PMP_TEXTURED, "objects/rotated_cube.obj", "textures/bill_mcdinner.png"},
+        {-10, 20, 100,       0, 0, 0, -9999999,          10, 10, 10,        RI_PMP_TEXTURED, "objects/rotated_cube.obj", "textures/bill_mcdinner.png"},
+        {-20, 20, 100,       0, 0, 0, -9999999,          10, 10, 10,        RI_PMP_TEXTURED, "objects/rotated_cube.obj", "textures/bill_mcdinner.png"},
+        {-30, 20, 100,          0, 0, 0, -9999999,          10, 10, 10,     RI_PMP_TEXTURED, "objects/rotated_cube.obj", "textures/bill_mcdinner.png"},
+        {0, -20, 100,          0, 0, 0, -9999999,          10, 10, 10,      RI_PMP_TEXTURED, "objects/rotated_cube.obj", "textures/bill_mcdinner.png"},
+        {10, -20, 100,        0, 0, 0, -9999999,          10, 10, 10,       RI_PMP_TEXTURED, "objects/rotated_cube.obj", "textures/bill_mcdinner.png"},
+        {20, -20, 100,         0, 0, 0, -9999999,          10, 10, 10,      RI_PMP_TEXTURED, "objects/rotated_cube.obj", "textures/bill_mcdinner.png"},
+        {30, -20, 100,       0, 0, 0, -9999999,          10, 10, 10,        RI_PMP_TEXTURED, "objects/rotated_cube.obj", "textures/bill_mcdinner.png"},
+        {-10, -20, 100,       0, 0, 0, -9999999,          10, 10, 10,       RI_PMP_TEXTURED, "objects/rotated_cube.obj", "textures/bill_mcdinner.png"},
+        {-20, -20, 100,       0, 0, 0, -9999999,          10, 10, 10,       RI_PMP_TEXTURED, "objects/rotated_cube.obj", "textures/bill_mcdinner.png"},
+        {-30, -20, 100,          0, 0, 0, -9999999,          10, 10, 10,    RI_PMP_TEXTURED, "objects/rotated_cube.obj", "textures/bill_mcdinner.png"},
+        {0, 30, 100,          0, 0, 0, -9999999,          10, 10, 10,       RI_PMP_TEXTURED, "objects/rotated_cube.obj", "textures/bill_mcdinner.png"},
+        {10, 30, 100,        0, 0, 0, -9999999,          10, 10, 10,        RI_PMP_TEXTURED, "objects/rotated_cube.obj", "textures/bill_mcdinner.png"},
+        {20, 30, 100,         0, 0, 0, -9999999,          10, 10, 10,       RI_PMP_TEXTURED, "objects/rotated_cube.obj", "textures/bill_mcdinner.png"},
+        {30, 30, 100,       0, 0, 0, -9999999,          10, 10, 10,         RI_PMP_TEXTURED, "objects/rotated_cube.obj", "textures/bill_mcdinner.png"},
+        {-10, 30, 100,       0, 0, 0, -9999999,          10, 10, 10,        RI_PMP_TEXTURED, "objects/rotated_cube.obj", "textures/bill_mcdinner.png"},
+        {-20, 30, 100,       0, 0, 0, -9999999,          10, 10, 10,        RI_PMP_TEXTURED, "objects/rotated_cube.obj", "textures/bill_mcdinner.png"},
+        {-30, 30, 100,          0, 0, 0, -9999999,          10, 10, 10,     RI_PMP_TEXTURED, "objects/rotated_cube.obj", "textures/bill_mcdinner.png"},
+        {0, -30, 100,          0, 0, 0, -9999999,          10, 10, 10,      RI_PMP_TEXTURED, "objects/rotated_cube.obj", "textures/bill_mcdinner.png"},
+        {10, -30, 100,        0, 0, 0, -9999999,          10, 10, 10,       RI_PMP_TEXTURED, "objects/rotated_cube.obj", "textures/bill_mcdinner.png"},
+        {20, -30, 100,         0, 0, 0, -9999999,          10, 10, 10,      RI_PMP_TEXTURED, "objects/rotated_cube.obj", "textures/bill_mcdinner.png"},
+        {30, -30, 100,       0, 0, 0, -9999999,          10, 10, 10,        RI_PMP_TEXTURED, "objects/rotated_cube.obj", "textures/bill_mcdinner.png"},
+        {-10, -30, 100,       0, 0, 0, -9999999,          10, 10, 10,       RI_PMP_TEXTURED, "objects/rotated_cube.obj", "textures/bill_mcdinner.png"},
+        {-20, -30, 100,       0, 0, 0, -9999999,          10, 10, 10,       RI_PMP_TEXTURED, "objects/rotated_cube.obj", "textures/bill_mcdinner.png"},
+        {-30, -30, 100,          0, 0, 0, -9999999,          10, 10, 10,    RI_PMP_TEXTURED, "objects/rotated_cube.obj", "textures/bill_mcdinner.png"},
     };
 
-    int objects_to_request = 49;
+    int objects_to_request = 1;
 
     RI_objects objects = RI_RequestObjects(object_buffer, objects_to_request);