Skip to content

Commit

Permalink
Implement the rest of the geometric mesh generation functions
Browse files Browse the repository at this point in the history
  • Loading branch information
@m-r-hunt
m-r-hunt committed Apr 17, 2023
1 parent 9bb32d9 commit eb7dc4f
Show file tree
Hide file tree
Showing 3 changed files with 157 additions and 23 deletions.
14 changes: 7 additions & 7 deletions api.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -335,14 +335,14 @@
[ ] bool IsModelAnimationValid(Model model, ModelAnimation anim)

// Mesh generation functions
[ ] Mesh GenMeshPoly(int sides, float radius)
[ ] Mesh GenMeshPlane(float width, float length, int resX, int resZ)
[x] Mesh GenMeshPoly(int sides, float radius)
[x] Mesh GenMeshPlane(float width, float length, int resX, int resZ)
[x] Mesh GenMeshCube(float width, float height, float length)
[ ] Mesh GenMeshSphere(float radius, int rings, int slices)
[ ] Mesh GenMeshHemiSphere(float radius, int rings, int slices)
[ ] Mesh GenMeshCylinder(float radius, float height, int slices)
[ ] Mesh GenMeshTorus(float radius, float size, int radSeg, int sides)
[ ] Mesh GenMeshKnot(float radius, float size, int radSeg, int sides)
[x] Mesh GenMeshSphere(float radius, int rings, int slices)
[x] Mesh GenMeshHemiSphere(float radius, int rings, int slices)
[x] Mesh GenMeshCylinder(float radius, float height, int slices)
[x] Mesh GenMeshTorus(float radius, float size, int radSeg, int sides)
[x] Mesh GenMeshKnot(float radius, float size, int radSeg, int sides)
[ ] Mesh GenMeshHeightmap(Image heightmap, Vector3 size)
[ ] Mesh GenMeshCubicmap(Image cubicmap, Vector3 cubeSize)

Expand Down
120 changes: 117 additions & 3 deletions src/3d.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -159,16 +159,98 @@ static Janet cfun_DrawMesh(int32_t argc, Janet *argv) {
return janet_wrap_nil();
}

static Janet cfun_GenMeshPoly(int32_t argc, Janet *argv) {
janet_fixarity(argc, 2);
int sides = janet_getinteger(argv, 0);
float radius = (float) janet_getnumber(argv, 1);
Mesh *polyMesh = janet_abstract(&AT_Mesh, sizeof(Mesh));
*polyMesh = GenMeshPoly(sides, radius);
return janet_wrap_abstract(polyMesh);
}

static Janet cfun_GenMeshPlane(int32_t argc, Janet *argv) {
janet_fixarity(argc, 4);
float width = (float) janet_getnumber(argv, 0);
float length = (float) janet_getnumber(argv, 1);
int resX = janet_getinteger(argv, 2);
int resY = janet_getinteger(argv, 3);
Mesh *planeMesh = janet_abstract(&AT_Mesh, sizeof(Mesh));
*planeMesh = GenMeshPlane(width, length, resX, resY);
return janet_wrap_abstract(planeMesh);
}

static Janet cfun_GenMeshCube(int32_t argc, Janet *argv) {
janet_fixarity(argc, 3);
float width = janet_getnumber(argv, 0);
float height = janet_getnumber(argv, 1);
float length = janet_getnumber(argv, 2);
float width = (float) janet_getnumber(argv, 0);
float height = (float) janet_getnumber(argv, 1);
float length = (float) janet_getnumber(argv, 2);
Mesh *cubeMesh = janet_abstract(&AT_Mesh, sizeof(Mesh));
*cubeMesh = GenMeshCube(width, height, length);
return janet_wrap_abstract(cubeMesh);
}

static Janet cfun_GenMeshSphere(int32_t argc, Janet *argv) {
janet_fixarity(argc, 3);
float radius = (float) janet_getnumber(argv, 0);
int rings = janet_getinteger(argv, 1);
int slices = janet_getinteger(argv, 2);
Mesh *sphereMesh = janet_abstract(&AT_Mesh, sizeof(Mesh));
*sphereMesh = GenMeshSphere(radius, rings, slices);
return janet_wrap_abstract(sphereMesh);
}

static Janet cfun_GenMeshHemiSphere(int32_t argc, Janet *argv) {
janet_fixarity(argc, 3);
float radius = (float) janet_getnumber(argv, 0);
int rings = janet_getinteger(argv, 1);
int slices = janet_getinteger(argv, 2);
Mesh *sphereMesh = janet_abstract(&AT_Mesh, sizeof(Mesh));
*sphereMesh = GenMeshHemiSphere(radius, rings, slices);
return janet_wrap_abstract(sphereMesh);
}

static Janet cfun_GenMeshCylinder(int32_t argc, Janet *argv) {
janet_fixarity(argc, 3);
float radius = (float) janet_getnumber(argv, 0);
float height = (float) janet_getnumber(argv, 1);
int slices = janet_getinteger(argv, 2);
Mesh *cylinderMesh = janet_abstract(&AT_Mesh, sizeof(Mesh));
*cylinderMesh = GenMeshCylinder(radius, height, slices);
return janet_wrap_abstract(cylinderMesh);
}

static Janet cfun_GenMeshCone(int32_t argc, Janet *argv) {
janet_fixarity(argc, 3);
float radius = (float) janet_getnumber(argv, 0);
float height = (float) janet_getnumber(argv, 1);
int slices = janet_getinteger(argv, 2);
Mesh *coneMesh = janet_abstract(&AT_Mesh, sizeof(Mesh));
*coneMesh = GenMeshCone(radius, height, slices);
return janet_wrap_abstract(coneMesh);
}

static Janet cfun_GenMeshTorus(int32_t argc, Janet *argv) {
janet_fixarity(argc, 4);
float radius = (float) janet_getnumber(argv, 0);
float size = (float) janet_getnumber(argv, 1);
int radSeg = janet_getinteger(argv, 2);
int sides = janet_getinteger(argv, 3);
Mesh *torusMesh = janet_abstract(&AT_Mesh, sizeof(Mesh));
*torusMesh = GenMeshTorus(radius, size, radSeg, sides);
return janet_wrap_abstract(torusMesh);
}

static Janet cfun_GenMeshKnot(int32_t argc, Janet *argv) {
janet_fixarity(argc, 4);
float radius = (float) janet_getnumber(argv, 0);
float size = (float) janet_getnumber(argv, 1);
int radSeg = janet_getinteger(argv, 2);
int sides = janet_getinteger(argv, 3);
Mesh *knotMesh = janet_abstract(&AT_Mesh, sizeof(Mesh));
*knotMesh = GenMeshKnot(radius, size, radSeg, sides);
return janet_wrap_abstract(knotMesh);
}

static Janet cfun_LoadMaterialDefault(int32_t argc, Janet *argv) {
janet_fixarity(argc, 0);
Material *defaultMaterial = janet_abstract(&AT_Material, sizeof(Material));
Expand Down Expand Up @@ -245,9 +327,41 @@ static JanetReg threed_cfuns[] = {
"(load-material-default)\n\n"
"Load and return the default material"
},
{"gen-mesh-poly", cfun_GenMeshPoly,
"(gen-mesh-poly sides radius)\n\n"
"Generate a polygonal mesh with given number of sides and radius"
},
{"gen-mesh-plane", cfun_GenMeshPlane,
"(gen-mesh-plane width length res-x res-y)\n\n"
"Generate a plane mesh with given dimensions and subdivisions"
},
{"gen-mesh-cube", cfun_GenMeshCube,
"(gen-mesh-cube width height length)\n\n"
"Generate a cube mesh with given dimensions"
},
{"gen-mesh-sphere", cfun_GenMeshSphere,
"(gen-mesh-sphere radius rings slices)\n\n"
"Generate a sphere mesh with given dimensions"
},
{"gen-mesh-hemisphere", cfun_GenMeshHemiSphere,
"(gen-mesh-hemisphere radius rings slices)\n\n"
"Generate a hemisphere mesh with given dimensions (no bottom cap)"
},
{"gen-mesh-cylinder", cfun_GenMeshCylinder,
"(gen-mesh-cylinder radius height slices)\n\n"
"Generate a cylinder mesh with given dimensions"
},
{"gen-mesh-cone", cfun_GenMeshCone,
"(gen-mesh-cone radius height slices)\n\n"
"Generate a cone mesh with given dimensions"
},
{"gen-mesh-torus", cfun_GenMeshTorus,
"(gen-mesh-torus radius size rad-seg sides)\n\n"
"Generate a torus mesh with given dimensions"
},
{"gen-mesh-knot", cfun_GenMeshKnot,
"(gen-mesh-knot radius size rad-seg sides)\n\n"
"Generate a trefoil knot mesh with given dimensions"
},
{NULL, NULL, NULL}
};
46 changes: 33 additions & 13 deletions test/test_mesh.janet
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,26 +6,46 @@
(init-window 800 600 "Mesh Stuff")
(set-target-fps 60)

(def camera (camera-3d :target [0 0 0]
:up [0 0 1]
:position [5 5 7]
:type :perspective
:fovy 60))
(def meshes [(gen-mesh-poly 5 0.5)
(gen-mesh-plane 1 1 10 10)
(gen-mesh-cube 1 1 1)
(gen-mesh-sphere 0.5 10 10)
(gen-mesh-hemisphere 0.5 10 10)
(gen-mesh-cylinder 0.5 1 10)
(gen-mesh-cone 0.5 1 10)
(gen-mesh-torus 0.25 1 10 10)
(gen-mesh-knot 0.25 1 100 100)])

(def mesh (gen-mesh-cube 2 2 2))
(def material (load-material-default))
(def transform [1 0 0 0
0 1 0 0
0 0 1 0
0 0 0 1])

(defn camera
[t]
(def center (- (length meshes) 0.5))
(camera-3d :target [center 0 0]
:up [0 1 0]
:position [(+ center (* 5 (math/cos t))) 7 (* 5 (math/sin t))]
:type :perspective
:fovy 60))

(defn make-transform
[x]
[1 0 0 (* 2 x)
0 1 0 0
0 0 1 0
0 0 0 1])

(var t 0)

(while (not (window-should-close))
(+= t (/ 1 60))
(begin-drawing)

(clear-background [0 0 0])

(begin-mode-3d camera)
(draw-mesh mesh material transform)
(begin-mode-3d (camera t))

(for i 0 (length meshes)
(draw-mesh (meshes i) material (make-transform i)))

(end-mode-3d)

(end-drawing))
Expand Down

0 comments on commit eb7dc4f

Please sign in to comment.