diff --git a/docs/src/curves.md b/docs/src/curves.md index df4425c..2ba73c9 100644 --- a/docs/src/curves.md +++ b/docs/src/curves.md @@ -52,7 +52,7 @@ M, N = size(z) points = map(x-> x ./ Point3f(4, 4, 1.0) .+ Point3f(0, 0, 1.0), vec(Point3f.(x, y', z))) # Connect the vetices with faces, as one would use for a 2D Rectangle # grid with M,N grid points -faces = decompose(LineFace{GLIndex}, Tesselation(Rect2(0, 0, 1, 1), (M, N))) +faces = decompose(LineFace{GLIndex}, Tessellation(Rect2(0, 0, 1, 1), (M, N))) indices = RPR.rpr_int[] for elem in faces push!(indices, first(elem)-1, first(elem)-1, last(elem)-1, last(elem)-1) diff --git a/docs/src/surface_mesh.jl b/docs/src/surface_mesh.jl index e12561f..bfabbf4 100644 --- a/docs/src/surface_mesh.jl +++ b/docs/src/surface_mesh.jl @@ -34,7 +34,7 @@ function create_mesh(DN = 512, dphi=pi/200.0f0, dtheta=dphi) z = @. r * sin(phi) * sin(theta) xyz = Point3f[Point3f(x[i, j], y[i, j], z[i, j]) for i in 1:size(x, 1), j in 1:size(x, 2)] - r = Tesselation(Rect2f((0, 0), (1, 1)), size(x)) + r = Tessellation(Rect2f((0, 0), (1, 1)), size(x)) # decomposing a rectangle into uv and triangles is what we need to map the z coordinates on # since the xyz data assumes the coordinates to have the same neighouring relations # like a grid diff --git a/examples/basic-uber.jl b/examples/basic-uber.jl index 2e4bc26..1fd13d7 100644 --- a/examples/basic-uber.jl +++ b/examples/basic-uber.jl @@ -49,9 +49,9 @@ mesh, mat = add_shape!(scene, context, matsys, Rect3f(Vec3f(0, -2, 0), Vec3f(5, mesh, mat = add_shape!(scene, context, matsys, Rect3f(Vec3f(0, 2, 0), Vec3f(5, 0.1, 5)); color=colorant"white") -mesh, mat = add_shape!(scene, context, matsys, Tesselation(Sphere(Point3f(2, 0, 2), 0.95f0), 100); +mesh, mat = add_shape!(scene, context, matsys, Tessellation(Sphere(Point3f(2, 0, 2), 0.95f0), 100); color=colorant"white") -rpr_mesh = RPR.Shape(context, Tesselation(Sphere(Point3f(2, 0, 2), 1.0f0), 100)) +rpr_mesh = RPR.Shape(context, Tessellation(Sphere(Point3f(2, 0, 2), 1.0f0), 100)) push!(scene, rpr_mesh) material = RPR.MaterialNode(matsys, RPR.RPR_MATERIAL_NODE_UBERV2) diff --git a/examples/basic.jl b/examples/basic.jl index 0578a3f..e6cab67 100644 --- a/examples/basic.jl +++ b/examples/basic.jl @@ -49,7 +49,7 @@ mesh, mat = add_shape!(scene, context, matsys, Rect3f(Vec3f(0, -2, 0), Vec3f(5, mesh, mat = add_shape!(scene, context, matsys, Rect3f(Vec3f(0, 2, 0), Vec3f(5, 0.1, 5)); color=colorant"white") -mesh, mat_sphere = add_shape!(scene, context, matsys, Tesselation(Sphere(Point3f(2, 0, 2), 1.0f0), 100); +mesh, mat_sphere = add_shape!(scene, context, matsys, Tessellation(Sphere(Point3f(2, 0, 2), 1.0f0), 100); material=RPR.RPR_MATERIAL_NODE_MICROFACET, roughness=0.2, color=colorant"red") fb_size = (800, 600) diff --git a/examples/curves.jl b/examples/curves.jl index b68b425..7648f41 100644 --- a/examples/curves.jl +++ b/examples/curves.jl @@ -53,7 +53,7 @@ M, N = size(z) points = map(x-> x ./ Point3f(4, 4, 1.0) .+ Point3f(0, 0, 1.0), vec(Point3f.(x, y', z))) # Connect the vetices with faces, as one would use for a 2D Rectangle # grid with M,N grid points -faces = decompose(LineFace{GLIndex}, Tesselation(Rect2(0, 0, 1, 1), (M, N))) +faces = decompose(LineFace{GLIndex}, Tessellation(Rect2(0, 0, 1, 1), (M, N))) indices = RPR.rpr_int[] for elem in faces push!(indices, first(elem)-1, first(elem)-1, last(elem)-1, last(elem)-1) diff --git a/examples/surfacemesh.jl b/examples/surfacemesh.jl index e12561f..bfabbf4 100644 --- a/examples/surfacemesh.jl +++ b/examples/surfacemesh.jl @@ -34,7 +34,7 @@ function create_mesh(DN = 512, dphi=pi/200.0f0, dtheta=dphi) z = @. r * sin(phi) * sin(theta) xyz = Point3f[Point3f(x[i, j], y[i, j], z[i, j]) for i in 1:size(x, 1), j in 1:size(x, 2)] - r = Tesselation(Rect2f((0, 0), (1, 1)), size(x)) + r = Tessellation(Rect2f((0, 0), (1, 1)), size(x)) # decomposing a rectangle into uv and triangles is what we need to map the z coordinates on # since the xyz data assumes the coordinates to have the same neighouring relations # like a grid diff --git a/test/runtests.jl b/test/runtests.jl index aa34710..0a87102 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -41,7 +41,7 @@ mesh, mat = add_shape!(scene, context, matsys, Rect3f(Vec3f(0, -2, 0), Vec3f(5, mesh, mat = add_shape!(scene, context, matsys, Rect3f(Vec3f(0, 2, 0), Vec3f(5, 0.1, 5)); color=colorant"blue") -mesh, mat_sphere = add_shape!(scene, context, matsys, Tesselation(Sphere(Point3f(2, 0, 2), 1.0f0), 100); color=colorant"red") +mesh, mat_sphere = add_shape!(scene, context, matsys, Tessellation(Sphere(Point3f(2, 0, 2), 1.0f0), 100); color=colorant"red") fb_size = (800, 600) frame_buffer = RPR.FrameBuffer(context, RGBA, fb_size) frame_bufferSolved = RPR.FrameBuffer(context, RGBA, fb_size)