Add UVMappog in config

Miou-zora · Miou-zora · commit dff36a74835a · 2024-05-04T16:28:07.000+02:00
diff --git a/config.json b/config.json
@@ -75,36 +75,31 @@
                         "y": -0.5,
                         "z": 2
                     },
-                    "color": {
-                        "r": 255,
-                        "g": 0,
-                        "b": 0
-                    }
+                    "texCoord": [
+                        1, 1
+                    ]
                 },
                 "vb": {
                     "position": {
                         "x": -2,
                         "y": 3,
                         "z": 3.5
                     },
-                    "color": {
-                        "r": 0,
-                        "g": 255,
-                        "b": 0
-                    }
+                    "texCoord": [
+                        0, 1
+                    ]
                 },
                 "vc": {
                     "position": {
                         "x": 0.5,
                         "y": -0.5,
                         "z": 4
                     },
-                    "color": {
-                        "r": 0,
-                        "g": 0,
-                        "b": 255
-                    }
-                }
+                    "texCoord": [
+                        0.5, 0
+                    ]
+                },
+                "textIdx": 0
             }
         }
     ],
@@ -172,5 +167,10 @@
                 "intensity": 0.3
             }
         }
+    ],
+    "assets": [
+        {
+            "imageName": "megu.png"
+        }
     ]
 }
diff --git a/src/Config.zig b/src/Config.zig
@@ -13,6 +13,7 @@ const Transformation = @import("Transformation.zig").Transformation;
 const Translation = @import("Translation.zig").Translation;
 const Rotation = @import("Rotation.zig").Rotation;
 const Vertex = @import("Vertex.zig").Vertex;
+const Image = Scene.Image;
 const rl = @cImport({
     @cInclude("raylib.h");
 });
@@ -45,6 +46,7 @@ const ObjectProxy = struct {
         va: Vertex,
         vb: Vertex,
         vc: Vertex,
+        textIdx: usize,
     } = null,
 };
 
@@ -53,11 +55,16 @@ const LightProxy = struct {
     point: ?PointLight = null,
 };
 
+const AssetProxy = struct {
+    imageName: [:0]const u8,
+};
+
 const ConfigProxy = struct {
     camera: Camera,
     materials: []Material,
     objects: []ObjectProxy,
     lights: []LightProxy,
+    assets: []AssetProxy,
 };
 
 fn transform_proxy_to_transform(transform: ?TransformationProxy) ?Transformation {
@@ -76,6 +83,11 @@ fn transform_proxy_to_transform(transform: ?TransformationProxy) ?Transformation
 pub const Config = struct {
     const Self = @This();
 
+    camera: Camera,
+    objects: []Object,
+    lights: []Light,
+    assets: []Image,
+
     pub fn fromFilePath(path: []const u8, allocator: std.mem.Allocator) !Self {
         // TODO: Check if there is a better way to do that
         // Cause right now it looks a little bit silly :3
@@ -93,7 +105,15 @@ pub const Config = struct {
             .camera = proxy.camera,
             .objects = try allocator.alloc(Object, proxy.objects.len),
             .lights = try allocator.alloc(Light, proxy.lights.len),
+            .assets = try allocator.alloc(Image, proxy.assets.len),
         };
+        for (proxy.assets, 0..) |obj, i| {
+            const image = rl.LoadImage(obj.imageName);
+            conf.assets[i] = Image{
+                .rlImage = image,
+                .rlColors = rl.LoadImageColors(image),
+            };
+        }
         for (proxy.objects, 0..) |obj, i| {
             if (obj.sphere) |item| {
                 conf.objects[i] = Object{ .sphere = .{
@@ -117,13 +137,11 @@ pub const Config = struct {
                     .transform = transform_proxy_to_transform(item.transform),
                 } };
             } else if (obj.triangle) |item| {
-                const image = rl.LoadImage("megu.png");
                 conf.objects[i] = Object{ .triangle = .{
                     .va = item.va,
                     .vb = item.vb,
                     .vc = item.vc,
-                    .image = image,
-                    .imageColor = rl.LoadImageColors(image),
+                    .text = &conf.assets[item.textIdx],
                 } };
             } else {
                 unreachable;
@@ -140,8 +158,4 @@ pub const Config = struct {
         }
         return conf;
     }
-
-    camera: Camera,
-    objects: []Object,
-    lights: []Light,
 };
diff --git a/src/Scene.zig b/src/Scene.zig
@@ -7,6 +7,9 @@ const Plane = @import("Plane.zig").Plane;
 const Transformation = @import("Transformation.zig").Transformation;
 const std = @import("std");
 const Triangle = @import("Triangle.zig").Triangle;
+const rl = @cImport({
+    @cInclude("raylib.h");
+});
 
 pub const SceneObject = union(enum) {
     sphere: Sphere,
@@ -20,6 +23,15 @@ pub const SceneLight = union(enum) {
     ambient_light: AmbientLight,
 };
 
+pub const Image = struct {
+    rlImage: rl.Image,
+    rlColors: [*]rl.Color,
+};
+
+pub const Asset = union(enum) {
+    image: Image,
+};
+
 pub const Scene = struct {
     const Self = @This();
 
diff --git a/src/Triangle.zig b/src/Triangle.zig
@@ -4,6 +4,7 @@ const HitRecord = @import("HitRecord.zig").HitRecord;
 const Vec3 = @import("Vec3.zig").Vec3;
 const Material = @import("Material.zig").Material;
 const std = @import("std");
+const Image = @import("Scene.zig").Image;
 const rl = @cImport({
     @cInclude("raylib.h");
 });
@@ -14,8 +15,7 @@ pub const Triangle = struct {
     va: Vertex,
     vb: Vertex,
     vc: Vertex,
-    imageColor: [*]rl.Color,
-    image: rl.Image,
+    text: *const Image,
 
     pub fn hits(self: *const Self, ray: Ray) HitRecord {
         // TODO: add bvh + compute this only one time
@@ -45,15 +45,12 @@ pub const Triangle = struct {
             return HitRecord.nil();
         }
 
-        const texCordA: @Vector(2, f32) = .{ 1, 1 };
-        const texCordB: @Vector(2, f32) = .{ 0, 1 };
-        const texCordC: @Vector(2, f32) = .{ 0.5, 0 };
         const posInImage: @Vector(2, usize) = .{
-            @as(usize, @intFromFloat((u * texCordA[0] + v * texCordB[0] + w * texCordC[0]) / (u + v + w) * @as(f32, @floatFromInt(self.image.width)))),
-            @as(usize, @intFromFloat((u * texCordA[1] + v * texCordB[1] + w * texCordC[1]) / (u + v + w) * @as(f32, @floatFromInt(self.image.height)))),
+            @as(usize, @intFromFloat((u * self.va.texCoord[0] + v * self.vb.texCoord[0] + w * self.vc.texCoord[0]) / (u + v + w) * @as(f32, @floatFromInt(self.text.rlImage.width)))),
+            @as(usize, @intFromFloat((u * self.va.texCoord[1] + v * self.vb.texCoord[1] + w * self.vc.texCoord[1]) / (u + v + w) * @as(f32, @floatFromInt(self.text.rlImage.height)))),
         };
-        const cInt_to_usize = @as(usize, @intCast(self.image.width));
-        const color: rl.Color = self.imageColor[posInImage[1] * cInt_to_usize + posInImage[0]];
+        const cInt_to_usize = @as(usize, @intCast(self.text.rlImage.width));
+        const color: rl.Color = self.text.rlColors[posInImage[1] * cInt_to_usize + posInImage[0]];
         const colorRGB = .{
             .r = @as(f32, @floatFromInt(color.r)),
             .g = @as(f32, @floatFromInt(color.g)),
@@ -62,7 +59,7 @@ pub const Triangle = struct {
 
         const material: Material = .{
             .color = colorRGB,
-            .reflective = 0.9,
+            .reflective = 0.75,
             .specular = 0,
         };
         return HitRecord{
diff --git a/src/Vertex.zig b/src/Vertex.zig
@@ -6,7 +6,5 @@ pub const Vertex = struct {
     const Self = @This();
 
     position: Pt3,
-    color: ColorRGB,
-    // normal: Vec3,
-    // texCoord: Vec2, // TODO: have Vec2 (or VecX (useful for quaternion))
+    texCoord: @Vector(2, f32),
 };
