From a095a4680cde046ec6c7601383586e43f4ee7476 Mon Sep 17 00:00:00 2001 From: Simon Date: Thu, 2 Mar 2023 16:44:22 +0100 Subject: [PATCH] update to new version (#13) * update to new version * clean up shape --- Project.toml | 2 +- src/LibRPR.jl | 226 ++++++++++++++++++++++--------------------- src/highlevel-api.jl | 3 - 3 files changed, 119 insertions(+), 112 deletions(-) diff --git a/Project.toml b/Project.toml index 098ab86..746998b 100644 --- a/Project.toml +++ b/Project.toml @@ -15,7 +15,7 @@ RadeonProRender_jll = "e92fa02b-1b7a-5e4e-a5cb-14fe26dfc45b" CEnum = "0.4" Colors = "0.9, 0.10, 0.11, 0.12" GeometryBasics = "0.4.1" -RadeonProRender_jll = "=2.2.12" +RadeonProRender_jll = "=2.2.17" julia = "1.6" [extras] diff --git a/src/LibRPR.jl b/src/LibRPR.jl index 5a91e7b..2b90cc2 100644 --- a/src/LibRPR.jl +++ b/src/LibRPR.jl @@ -3,13 +3,13 @@ module RPR using RadeonProRender_jll export RadeonProRender_jll +using CEnum + function check_error(error_code) error_code == RPR_SUCCESS && return return error("Error code returned: $(error_code)") end -using CEnum - const rpr_char = Cchar const rpr_uchar = Cuchar @@ -273,12 +273,6 @@ end RPR_CONTEXT_SCENE = 265 RPR_CONTEXT_ITERATIONS = 267 RPR_CONTEXT_IMAGE_FILTER_TYPE = 268 - RPR_CONTEXT_IMAGE_FILTER_BOX_RADIUS = 269 - RPR_CONTEXT_IMAGE_FILTER_GAUSSIAN_RADIUS = 270 - RPR_CONTEXT_IMAGE_FILTER_TRIANGLE_RADIUS = 271 - RPR_CONTEXT_IMAGE_FILTER_MITCHELL_RADIUS = 272 - RPR_CONTEXT_IMAGE_FILTER_LANCZOS_RADIUS = 273 - RPR_CONTEXT_IMAGE_FILTER_BLACKMANHARRIS_RADIUS = 274 RPR_CONTEXT_TONE_MAPPING_TYPE = 275 RPR_CONTEXT_TONE_MAPPING_LINEAR_SCALE = 276 RPR_CONTEXT_TONE_MAPPING_PHOTO_LINEAR_SENSITIVITY = 277 @@ -288,7 +282,7 @@ end RPR_CONTEXT_TONE_MAPPING_REINHARD02_POST_SCALE = 281 RPR_CONTEXT_TONE_MAPPING_REINHARD02_BURN = 282 RPR_CONTEXT_MAX_RECURSION = 283 - RPR_CONTEXT_RAY_CAST_EPISLON = 284 + RPR_CONTEXT_RAY_CAST_EPSILON = 284 RPR_CONTEXT_RADIANCE_CLAMP = 285 RPR_CONTEXT_X_FLIP = 286 RPR_CONTEXT_Y_FLIP = 287 @@ -383,6 +377,7 @@ end RPR_CONTEXT_CONTOUR_USE_UV = 390 RPR_CONTEXT_CONTOUR_NORMAL_THRESHOLD = 374 RPR_CONTEXT_CONTOUR_UV_THRESHOLD = 391 + RPR_CONTEXT_CONTOUR_UV_SECONDARY = 404 RPR_CONTEXT_CONTOUR_LINEWIDTH_OBJECTID = 375 RPR_CONTEXT_CONTOUR_LINEWIDTH_MATERIALID = 376 RPR_CONTEXT_CONTOUR_LINEWIDTH_NORMAL = 377 @@ -406,9 +401,21 @@ end RPR_CONTEXT_ATMOSPHERE_VOLUME_DENSITY = 397 RPR_CONTEXT_ATMOSPHERE_VOLUME_RADIANCE_CLAMP = 399 RPR_CONTEXT_FOG_HEIGHT_OFFSET = 398 + RPR_CONTEXT_INDIRECT_DOWNSAMPLE = 400 RPR_CONTEXT_CRYPTOMATTE_EXTENDED = 401 RPR_CONTEXT_CRYPTOMATTE_SPLIT_INDIRECT = 402 RPR_CONTEXT_FOG_DIRECTION = 403 + RPR_CONTEXT_RANDOM_SEED = 4096 + RPR_CONTEXT_IBL_DISPLAY = 405 + RPR_CONTEXT_FRAMEBUFFER_SAVE_FLOAT32 = 406 + RPR_CONTEXT_UPDATE_TIME_CALLBACK_FUNC = 407 + RPR_CONTEXT_UPDATE_TIME_CALLBACK_DATA = 408 + RPR_CONTEXT_RENDER_TIME_CALLBACK_FUNC = 409 + RPR_CONTEXT_RENDER_TIME_CALLBACK_DATA = 410 + RPR_CONTEXT_FIRST_ITERATION_TIME_CALLBACK_FUNC = 411 + RPR_CONTEXT_FIRST_ITERATION_TIME_CALLBACK_DATA = 412 + RPR_CONTEXT_IMAGE_FILTER_RADIUS = 413 + RPR_CONTEXT_PRECOMPILED_BINARY_PATH = 414 RPR_CONTEXT_NAME = 7829367 RPR_CONTEXT_UNIQUE_ID = 7829368 RPR_CONTEXT_CUSTOM_PTR = 7829369 @@ -439,6 +446,7 @@ end RPR_CAMERA_ANGULAR_MOTION = 534 RPR_CAMERA_MOTION_TRANSFORMS_COUNT = 535 RPR_CAMERA_MOTION_TRANSFORMS = 536 + RPR_CAMERA_POST_SCALE = 537 RPR_CAMERA_NAME = 7829367 RPR_CAMERA_UNIQUE_ID = 7829368 RPR_CAMERA_CUSTOM_PTR = 7829369 @@ -516,6 +524,7 @@ end RPR_SHAPE_SHADOW_COLOR = 1071 RPR_SHAPE_VISIBILITY_RECEIVE_SHADOW = 1072 RPR_SHAPE_PRIMVARS = 1073 + RPR_SHAPE_ENVIRONMENT_LIGHT = 1074 RPR_SHAPE_NAME = 7829367 RPR_SHAPE_UNIQUE_ID = 7829368 RPR_SHAPE_CUSTOM_PTR = 7829369 @@ -578,6 +587,7 @@ end RPR_LIGHT_TRANSFORM = 2051 RPR_LIGHT_GROUP_ID = 2053 RPR_LIGHT_RENDER_LAYER_LIST = 2054 + RPR_LIGHT_VISIBILITY_LIGHT = 2055 RPR_LIGHT_NAME = 7829367 RPR_LIGHT_UNIQUE_ID = 7829368 RPR_LIGHT_CUSTOM_PTR = 7829369 @@ -638,6 +648,7 @@ end RPR_COMPONENT_TYPE_FLOAT32 = 3 RPR_COMPONENT_TYPE_UNKNOWN = 4 RPR_COMPONENT_TYPE_DEEP = 5 + RPR_COMPONENT_TYPE_UINT32 = 6 end @cenum rpr_buffer_element_type::UInt32 begin @@ -758,6 +769,7 @@ end RPR_MATERIAL_NODE_BLACKBODY = 52 RPR_MATERIAL_NODE_RAMP = 53 RPR_MATERIAL_NODE_PRIMVAR_LOOKUP = 54 + RPR_MATERIAL_NODE_ROUNDED_CORNER = 55 RPR_MATERIAL_NODE_MATX_DIFFUSE_BRDF = 4096 RPR_MATERIAL_NODE_MATX_DIELECTRIC_BRDF = 4097 RPR_MATERIAL_NODE_MATX_GENERALIZED_SCHLICK_BRDF = 4098 @@ -832,6 +844,7 @@ end RPR_MATERIAL_NODE_MATX_COMBINE3 = 4167 RPR_MATERIAL_NODE_MATX_COMBINE4 = 4168 RPR_MATERIAL_NODE_MATX_TRIPLANARPROJECTION = 4169 + RPR_MATERIAL_NODE_MATX_MULTIPLY = 4170 end @cenum rpr_material_node_input::UInt32 begin @@ -946,6 +959,8 @@ end RPR_MATERIAL_INPUT_W = 108 RPR_MATERIAL_INPUT_LIGHT = 109 RPR_MATERIAL_INPUT_MID_IS_ALBEDO = 110 + RPR_MATERIAL_INPUT_SAMPLES = 111 + RPR_MATERIAL_INPUT_BASE_NORMAL = 112 RPR_MATERIAL_INPUT_UBER_DIFFUSE_COLOR = 2320 RPR_MATERIAL_INPUT_UBER_DIFFUSE_WEIGHT = 2343 RPR_MATERIAL_INPUT_UBER_DIFFUSE_ROUGHNESS = 2321 @@ -1168,6 +1183,8 @@ end RPR_AOV_LPE_7 = 39 RPR_AOV_LPE_8 = 40 RPR_AOV_CAMERA_NORMAL = 41 + RPR_AOV_MATTE_PASS = 42 + RPR_AOV_SSS = 43 RPR_AOV_CRYPTOMATTE_MAT0 = 48 RPR_AOV_CRYPTOMATTE_MAT1 = 49 RPR_AOV_CRYPTOMATTE_MAT2 = 50 @@ -1193,6 +1210,7 @@ end RPR_AOV_LIGHT_GROUP13 = 89 RPR_AOV_LIGHT_GROUP14 = 90 RPR_AOV_LIGHT_GROUP15 = 91 + RPR_AOV_MESH_ID = 96 end @cenum rpr_post_effect_type::UInt32 begin @@ -1400,9 +1418,9 @@ end function rprCreateContext(api_version, pluginIDs, pluginCount, creation_flags, props, cache_path) out_context = Ref{rpr_context}() - #= C:\Users\sdani\SimiWorld\ProgrammerLife\MakieDev\dev\RadeonProRender\build\generate-master.jl:39 =# + #= /mnt/c/Users/sdani/SimiWorld/ProgrammerLife/MakieDev/dev/RadeonProRender/build/generate-master.jl:39 =# check_error(ccall((:rprCreateContext, libRadeonProRender64), rpr_status, (rpr_uint, Ptr{rpr_int}, Cint, rpr_creation_flags, Ptr{rpr_context_properties}, Ptr{rpr_char}, Ptr{rpr_context}), api_version, pluginIDs, pluginCount, creation_flags, props, cache_path, out_context)) - #= C:\Users\sdani\SimiWorld\ProgrammerLife\MakieDev\dev\RadeonProRender\build\generate-master.jl:39 =# + #= /mnt/c/Users/sdani/SimiWorld/ProgrammerLife/MakieDev/dev/RadeonProRender/build/generate-master.jl:39 =# return out_context[] end @@ -1420,9 +1438,9 @@ end function rprContextGetAOV(context, aov) out_fb = Ref{rpr_framebuffer}() - #= C:\Users\sdani\SimiWorld\ProgrammerLife\MakieDev\dev\RadeonProRender\build\generate-master.jl:39 =# + #= /mnt/c/Users/sdani/SimiWorld/ProgrammerLife/MakieDev/dev/RadeonProRender/build/generate-master.jl:39 =# check_error(ccall((:rprContextGetAOV, libRadeonProRender64), rpr_status, (rpr_context, rpr_aov, Ptr{rpr_framebuffer}), context, aov, out_fb)) - #= C:\Users\sdani\SimiWorld\ProgrammerLife\MakieDev\dev\RadeonProRender\build\generate-master.jl:39 =# + #= /mnt/c/Users/sdani/SimiWorld/ProgrammerLife/MakieDev/dev/RadeonProRender/build/generate-master.jl:39 =# return out_fb[] end @@ -1468,9 +1486,9 @@ end function rprContextGetScene(arg0) out_scene = Ref{rpr_scene}() - #= C:\Users\sdani\SimiWorld\ProgrammerLife\MakieDev\dev\RadeonProRender\build\generate-master.jl:39 =# + #= /mnt/c/Users/sdani/SimiWorld/ProgrammerLife/MakieDev/dev/RadeonProRender/build/generate-master.jl:39 =# check_error(ccall((:rprContextGetScene, libRadeonProRender64), rpr_status, (rpr_context, Ptr{rpr_scene}), arg0, out_scene)) - #= C:\Users\sdani\SimiWorld\ProgrammerLife\MakieDev\dev\RadeonProRender\build\generate-master.jl:39 =# + #= /mnt/c/Users/sdani/SimiWorld/ProgrammerLife/MakieDev/dev/RadeonProRender/build/generate-master.jl:39 =# return out_scene[] end @@ -1540,97 +1558,97 @@ end function rprContextCreateImage(context, format, image_desc, data) out_image = Ref{rpr_image}() - #= C:\Users\sdani\SimiWorld\ProgrammerLife\MakieDev\dev\RadeonProRender\build\generate-master.jl:39 =# + #= /mnt/c/Users/sdani/SimiWorld/ProgrammerLife/MakieDev/dev/RadeonProRender/build/generate-master.jl:39 =# check_error(ccall((:rprContextCreateImage, libRadeonProRender64), rpr_status, (rpr_context, rpr_image_format, Ptr{rpr_image_desc}, Ptr{Cvoid}, Ptr{rpr_image}), context, format, image_desc, data, out_image)) - #= C:\Users\sdani\SimiWorld\ProgrammerLife\MakieDev\dev\RadeonProRender\build\generate-master.jl:39 =# + #= /mnt/c/Users/sdani/SimiWorld/ProgrammerLife/MakieDev/dev/RadeonProRender/build/generate-master.jl:39 =# return out_image[] end function rprContextCreateBuffer(context, buffer_desc, data) out_buffer = Ref{rpr_buffer}() - #= C:\Users\sdani\SimiWorld\ProgrammerLife\MakieDev\dev\RadeonProRender\build\generate-master.jl:39 =# + #= /mnt/c/Users/sdani/SimiWorld/ProgrammerLife/MakieDev/dev/RadeonProRender/build/generate-master.jl:39 =# check_error(ccall((:rprContextCreateBuffer, libRadeonProRender64), rpr_status, (rpr_context, Ptr{rpr_buffer_desc}, Ptr{Cvoid}, Ptr{rpr_buffer}), context, buffer_desc, data, out_buffer)) - #= C:\Users\sdani\SimiWorld\ProgrammerLife\MakieDev\dev\RadeonProRender\build\generate-master.jl:39 =# + #= /mnt/c/Users/sdani/SimiWorld/ProgrammerLife/MakieDev/dev/RadeonProRender/build/generate-master.jl:39 =# return out_buffer[] end function rprContextCreateImageFromFile(context, path) out_image = Ref{rpr_image}() - #= C:\Users\sdani\SimiWorld\ProgrammerLife\MakieDev\dev\RadeonProRender\build\generate-master.jl:39 =# + #= /mnt/c/Users/sdani/SimiWorld/ProgrammerLife/MakieDev/dev/RadeonProRender/build/generate-master.jl:39 =# check_error(ccall((:rprContextCreateImageFromFile, libRadeonProRender64), rpr_status, (rpr_context, Ptr{rpr_char}, Ptr{rpr_image}), context, path, out_image)) - #= C:\Users\sdani\SimiWorld\ProgrammerLife\MakieDev\dev\RadeonProRender\build\generate-master.jl:39 =# + #= /mnt/c/Users/sdani/SimiWorld/ProgrammerLife/MakieDev/dev/RadeonProRender/build/generate-master.jl:39 =# return out_image[] end function rprContextCreateImageFromFileMemory(context, extension, data, dataSizeByte) out_image = Ref{rpr_image}() - #= C:\Users\sdani\SimiWorld\ProgrammerLife\MakieDev\dev\RadeonProRender\build\generate-master.jl:39 =# + #= /mnt/c/Users/sdani/SimiWorld/ProgrammerLife/MakieDev/dev/RadeonProRender/build/generate-master.jl:39 =# check_error(ccall((:rprContextCreateImageFromFileMemory, libRadeonProRender64), rpr_status, (rpr_context, Ptr{rpr_char}, Ptr{Cvoid}, Cint, Ptr{rpr_image}), context, extension, data, dataSizeByte, out_image)) - #= C:\Users\sdani\SimiWorld\ProgrammerLife\MakieDev\dev\RadeonProRender\build\generate-master.jl:39 =# + #= /mnt/c/Users/sdani/SimiWorld/ProgrammerLife/MakieDev/dev/RadeonProRender/build/generate-master.jl:39 =# return out_image[] end function rprContextCreateScene(context) out_scene = Ref{rpr_scene}() - #= C:\Users\sdani\SimiWorld\ProgrammerLife\MakieDev\dev\RadeonProRender\build\generate-master.jl:39 =# + #= /mnt/c/Users/sdani/SimiWorld/ProgrammerLife/MakieDev/dev/RadeonProRender/build/generate-master.jl:39 =# check_error(ccall((:rprContextCreateScene, libRadeonProRender64), rpr_status, (rpr_context, Ptr{rpr_scene}), context, out_scene)) - #= C:\Users\sdani\SimiWorld\ProgrammerLife\MakieDev\dev\RadeonProRender\build\generate-master.jl:39 =# + #= /mnt/c/Users/sdani/SimiWorld/ProgrammerLife/MakieDev/dev/RadeonProRender/build/generate-master.jl:39 =# return out_scene[] end function rprContextCreateInstance(context, shape) out_instance = Ref{rpr_shape}() - #= C:\Users\sdani\SimiWorld\ProgrammerLife\MakieDev\dev\RadeonProRender\build\generate-master.jl:39 =# + #= /mnt/c/Users/sdani/SimiWorld/ProgrammerLife/MakieDev/dev/RadeonProRender/build/generate-master.jl:39 =# check_error(ccall((:rprContextCreateInstance, libRadeonProRender64), rpr_status, (rpr_context, rpr_shape, Ptr{rpr_shape}), context, shape, out_instance)) - #= C:\Users\sdani\SimiWorld\ProgrammerLife\MakieDev\dev\RadeonProRender\build\generate-master.jl:39 =# + #= /mnt/c/Users/sdani/SimiWorld/ProgrammerLife/MakieDev/dev/RadeonProRender/build/generate-master.jl:39 =# return out_instance[] end function rprContextCreateMesh(context, vertices, num_vertices, vertex_stride, normals, num_normals, normal_stride, texcoords, num_texcoords, texcoord_stride, vertex_indices, vidx_stride, normal_indices, nidx_stride, texcoord_indices, tidx_stride, num_face_vertices, num_faces) out_mesh = Ref{rpr_shape}() - #= C:\Users\sdani\SimiWorld\ProgrammerLife\MakieDev\dev\RadeonProRender\build\generate-master.jl:39 =# + #= /mnt/c/Users/sdani/SimiWorld/ProgrammerLife/MakieDev/dev/RadeonProRender/build/generate-master.jl:39 =# check_error(ccall((:rprContextCreateMesh, libRadeonProRender64), rpr_status, (rpr_context, Ptr{rpr_float}, Cint, rpr_int, Ptr{rpr_float}, Cint, rpr_int, Ptr{rpr_float}, Cint, rpr_int, Ptr{rpr_int}, rpr_int, Ptr{rpr_int}, rpr_int, Ptr{rpr_int}, rpr_int, Ptr{rpr_int}, Cint, Ptr{rpr_shape}), context, vertices, num_vertices, vertex_stride, normals, num_normals, normal_stride, texcoords, num_texcoords, texcoord_stride, vertex_indices, vidx_stride, normal_indices, nidx_stride, texcoord_indices, tidx_stride, num_face_vertices, num_faces, out_mesh)) - #= C:\Users\sdani\SimiWorld\ProgrammerLife\MakieDev\dev\RadeonProRender\build\generate-master.jl:39 =# + #= /mnt/c/Users/sdani/SimiWorld/ProgrammerLife/MakieDev/dev/RadeonProRender/build/generate-master.jl:39 =# return out_mesh[] end function rprContextCreateMeshEx(context, vertices, num_vertices, vertex_stride, normals, num_normals, normal_stride, perVertexFlag, num_perVertexFlags, perVertexFlag_stride, numberOfTexCoordLayers, texcoords, num_texcoords, texcoord_stride, vertex_indices, vidx_stride, normal_indices, nidx_stride, texcoord_indices, tidx_stride, num_face_vertices, num_faces) out_mesh = Ref{rpr_shape}() - #= C:\Users\sdani\SimiWorld\ProgrammerLife\MakieDev\dev\RadeonProRender\build\generate-master.jl:39 =# + #= /mnt/c/Users/sdani/SimiWorld/ProgrammerLife/MakieDev/dev/RadeonProRender/build/generate-master.jl:39 =# check_error(ccall((:rprContextCreateMeshEx, libRadeonProRender64), rpr_status, (rpr_context, Ptr{rpr_float}, Cint, rpr_int, Ptr{rpr_float}, Cint, rpr_int, Ptr{rpr_int}, Cint, rpr_int, rpr_int, Ptr{Ptr{rpr_float}}, Ptr{Cint}, Ptr{rpr_int}, Ptr{rpr_int}, rpr_int, Ptr{rpr_int}, rpr_int, Ptr{Ptr{rpr_int}}, Ptr{rpr_int}, Ptr{rpr_int}, Cint, Ptr{rpr_shape}), context, vertices, num_vertices, vertex_stride, normals, num_normals, normal_stride, perVertexFlag, num_perVertexFlags, perVertexFlag_stride, numberOfTexCoordLayers, texcoords, num_texcoords, texcoord_stride, vertex_indices, vidx_stride, normal_indices, nidx_stride, texcoord_indices, tidx_stride, num_face_vertices, num_faces, out_mesh)) - #= C:\Users\sdani\SimiWorld\ProgrammerLife\MakieDev\dev\RadeonProRender\build\generate-master.jl:39 =# + #= /mnt/c/Users/sdani/SimiWorld/ProgrammerLife/MakieDev/dev/RadeonProRender/build/generate-master.jl:39 =# return out_mesh[] end function rprContextCreateMeshEx2(context, vertices, num_vertices, vertex_stride, normals, num_normals, normal_stride, perVertexFlag, num_perVertexFlags, perVertexFlag_stride, numberOfTexCoordLayers, texcoords, num_texcoords, texcoord_stride, vertex_indices, vidx_stride, normal_indices, nidx_stride, texcoord_indices, tidx_stride, num_face_vertices, num_faces, mesh_properties) out_mesh = Ref{rpr_shape}() - #= C:\Users\sdani\SimiWorld\ProgrammerLife\MakieDev\dev\RadeonProRender\build\generate-master.jl:39 =# + #= /mnt/c/Users/sdani/SimiWorld/ProgrammerLife/MakieDev/dev/RadeonProRender/build/generate-master.jl:39 =# check_error(ccall((:rprContextCreateMeshEx2, libRadeonProRender64), rpr_status, (rpr_context, Ptr{rpr_float}, Cint, rpr_int, Ptr{rpr_float}, Cint, rpr_int, Ptr{rpr_int}, Cint, rpr_int, rpr_int, Ptr{Ptr{rpr_float}}, Ptr{Cint}, Ptr{rpr_int}, Ptr{rpr_int}, rpr_int, Ptr{rpr_int}, rpr_int, Ptr{Ptr{rpr_int}}, Ptr{rpr_int}, Ptr{rpr_int}, Cint, Ptr{rpr_mesh_info}, Ptr{rpr_shape}), context, vertices, num_vertices, vertex_stride, normals, num_normals, normal_stride, perVertexFlag, num_perVertexFlags, perVertexFlag_stride, numberOfTexCoordLayers, texcoords, num_texcoords, texcoord_stride, vertex_indices, vidx_stride, normal_indices, nidx_stride, texcoord_indices, tidx_stride, num_face_vertices, num_faces, mesh_properties, out_mesh)) - #= C:\Users\sdani\SimiWorld\ProgrammerLife\MakieDev\dev\RadeonProRender\build\generate-master.jl:39 =# + #= /mnt/c/Users/sdani/SimiWorld/ProgrammerLife/MakieDev/dev/RadeonProRender/build/generate-master.jl:39 =# return out_mesh[] end function rprContextCreateCamera(context) out_camera = Ref{rpr_camera}() - #= C:\Users\sdani\SimiWorld\ProgrammerLife\MakieDev\dev\RadeonProRender\build\generate-master.jl:39 =# + #= /mnt/c/Users/sdani/SimiWorld/ProgrammerLife/MakieDev/dev/RadeonProRender/build/generate-master.jl:39 =# check_error(ccall((:rprContextCreateCamera, libRadeonProRender64), rpr_status, (rpr_context, Ptr{rpr_camera}), context, out_camera)) - #= C:\Users\sdani\SimiWorld\ProgrammerLife\MakieDev\dev\RadeonProRender\build\generate-master.jl:39 =# + #= /mnt/c/Users/sdani/SimiWorld/ProgrammerLife/MakieDev/dev/RadeonProRender/build/generate-master.jl:39 =# return out_camera[] end function rprContextCreateFrameBuffer(context, format, fb_desc) out_fb = Ref{rpr_framebuffer}() - #= C:\Users\sdani\SimiWorld\ProgrammerLife\MakieDev\dev\RadeonProRender\build\generate-master.jl:39 =# + #= /mnt/c/Users/sdani/SimiWorld/ProgrammerLife/MakieDev/dev/RadeonProRender/build/generate-master.jl:39 =# check_error(ccall((:rprContextCreateFrameBuffer, libRadeonProRender64), rpr_status, (rpr_context, rpr_framebuffer_format, Ptr{rpr_framebuffer_desc}, Ptr{rpr_framebuffer}), context, format, fb_desc, out_fb)) - #= C:\Users\sdani\SimiWorld\ProgrammerLife\MakieDev\dev\RadeonProRender\build\generate-master.jl:39 =# + #= /mnt/c/Users/sdani/SimiWorld/ProgrammerLife/MakieDev/dev/RadeonProRender/build/generate-master.jl:39 =# return out_fb[] end function rprContextGetFunctionPtr(context, function_name) out_function_ptr = Ref{Ptr{Cvoid}}() - #= C:\Users\sdani\SimiWorld\ProgrammerLife\MakieDev\dev\RadeonProRender\build\generate-master.jl:39 =# + #= /mnt/c/Users/sdani/SimiWorld/ProgrammerLife/MakieDev/dev/RadeonProRender/build/generate-master.jl:39 =# check_error(ccall((:rprContextGetFunctionPtr, libRadeonProRender64), rpr_status, (rpr_context, Ptr{rpr_char}, Ptr{Ptr{Cvoid}}), context, function_name, out_function_ptr)) - #= C:\Users\sdani\SimiWorld\ProgrammerLife\MakieDev\dev\RadeonProRender\build\generate-master.jl:39 =# + #= /mnt/c/Users/sdani/SimiWorld/ProgrammerLife/MakieDev/dev/RadeonProRender/build/generate-master.jl:39 =# return out_function_ptr[] end @@ -1642,14 +1660,6 @@ function rprCameraSetFocalLength(camera, flength) check_error(ccall((:rprCameraSetFocalLength, libRadeonProRender64), rpr_status, (rpr_camera, rpr_float), camera, flength)) end -function rprCameraSetLinearMotion(camera, x, y, z) - check_error(ccall((:rprCameraSetLinearMotion, libRadeonProRender64), rpr_status, (rpr_camera, rpr_float, rpr_float, rpr_float), camera, x, y, z)) -end - -function rprCameraSetAngularMotion(camera, x, y, z, w) - check_error(ccall((:rprCameraSetAngularMotion, libRadeonProRender64), rpr_status, (rpr_camera, rpr_float, rpr_float, rpr_float, rpr_float), camera, x, y, z, w)) -end - function rprCameraSetMotionTransformCount(camera, transformCount) check_error(ccall((:rprCameraSetMotionTransformCount, libRadeonProRender64), rpr_status, (rpr_camera, rpr_uint), camera, transformCount)) end @@ -1718,6 +1728,10 @@ function rprCameraSetNearPlane(camera, near) check_error(ccall((:rprCameraSetNearPlane, libRadeonProRender64), rpr_status, (rpr_camera, rpr_float), camera, near)) end +function rprCameraSetPostScale(camera, scale) + check_error(ccall((:rprCameraSetPostScale, libRadeonProRender64), rpr_status, (rpr_camera, rpr_float), camera, scale)) +end + function rprCameraSetFarPlane(camera, far) check_error(ccall((:rprCameraSetFarPlane, libRadeonProRender64), rpr_status, (rpr_camera, rpr_float), camera, far)) end @@ -1838,18 +1852,6 @@ function rprShapeSetVolumeMaterial(shape, node) check_error(ccall((:rprShapeSetVolumeMaterial, libRadeonProRender64), rpr_status, (rpr_shape, rpr_material_node), shape, node)) end -function rprShapeSetLinearMotion(shape, x, y, z) - check_error(ccall((:rprShapeSetLinearMotion, libRadeonProRender64), rpr_status, (rpr_shape, rpr_float, rpr_float, rpr_float), shape, x, y, z)) -end - -function rprShapeSetAngularMotion(shape, x, y, z, w) - check_error(ccall((:rprShapeSetAngularMotion, libRadeonProRender64), rpr_status, (rpr_shape, rpr_float, rpr_float, rpr_float, rpr_float), shape, x, y, z, w)) -end - -function rprShapeSetScaleMotion(shape, x, y, z) - check_error(ccall((:rprShapeSetScaleMotion, libRadeonProRender64), rpr_status, (rpr_shape, rpr_float, rpr_float, rpr_float), shape, x, y, z)) -end - function rprShapeSetMotionTransformCount(shape, transformCount) check_error(ccall((:rprShapeSetMotionTransformCount, libRadeonProRender64), rpr_status, (rpr_shape, rpr_uint), shape, transformCount)) end @@ -1870,6 +1872,10 @@ function rprShapeSetVisibility(shape, visible) check_error(ccall((:rprShapeSetVisibility, libRadeonProRender64), rpr_status, (rpr_shape, rpr_bool), shape, visible)) end +function rprLightSetVisibilityFlag(light, visibilityFlag, visible) + check_error(ccall((:rprLightSetVisibilityFlag, libRadeonProRender64), rpr_status, (rpr_light, rpr_light_info, rpr_bool), light, visibilityFlag, visible)) +end + function rprCurveSetVisibility(curve, visible) check_error(ccall((:rprCurveSetVisibility, libRadeonProRender64), rpr_status, (rpr_curve, rpr_bool), curve, visible)) end @@ -1894,6 +1900,10 @@ function rprShapeSetContourIgnore(shape, ignoreInContour) check_error(ccall((:rprShapeSetContourIgnore, libRadeonProRender64), rpr_status, (rpr_shape, rpr_bool), shape, ignoreInContour)) end +function rprShapeSetEnvironmentLight(shape, envLight) + check_error(ccall((:rprShapeSetEnvironmentLight, libRadeonProRender64), rpr_status, (rpr_shape, rpr_bool), shape, envLight)) +end + function rprShapeMarkStatic(in_shape, in_is_static) check_error(ccall((:rprShapeMarkStatic, libRadeonProRender64), rpr_status, (rpr_shape, rpr_bool), in_shape, in_is_static)) end @@ -1932,17 +1942,17 @@ end function rprInstanceGetBaseShape(shape) out_shape = Ref{rpr_shape}() - #= C:\Users\sdani\SimiWorld\ProgrammerLife\MakieDev\dev\RadeonProRender\build\generate-master.jl:39 =# + #= /mnt/c/Users/sdani/SimiWorld/ProgrammerLife/MakieDev/dev/RadeonProRender/build/generate-master.jl:39 =# check_error(ccall((:rprInstanceGetBaseShape, libRadeonProRender64), rpr_status, (rpr_shape, Ptr{rpr_shape}), shape, out_shape)) - #= C:\Users\sdani\SimiWorld\ProgrammerLife\MakieDev\dev\RadeonProRender\build\generate-master.jl:39 =# + #= /mnt/c/Users/sdani/SimiWorld/ProgrammerLife/MakieDev/dev/RadeonProRender/build/generate-master.jl:39 =# return out_shape[] end function rprContextCreatePointLight(context) out_light = Ref{rpr_light}() - #= C:\Users\sdani\SimiWorld\ProgrammerLife\MakieDev\dev\RadeonProRender\build\generate-master.jl:39 =# + #= /mnt/c/Users/sdani/SimiWorld/ProgrammerLife/MakieDev/dev/RadeonProRender/build/generate-master.jl:39 =# check_error(ccall((:rprContextCreatePointLight, libRadeonProRender64), rpr_status, (rpr_context, Ptr{rpr_light}), context, out_light)) - #= C:\Users\sdani\SimiWorld\ProgrammerLife\MakieDev\dev\RadeonProRender\build\generate-master.jl:39 =# + #= /mnt/c/Users/sdani/SimiWorld/ProgrammerLife/MakieDev/dev/RadeonProRender/build/generate-master.jl:39 =# return out_light[] end @@ -1974,8 +1984,8 @@ function rprSphereLightSetRadiantPower3f(light, r, g, b) check_error(ccall((:rprSphereLightSetRadiantPower3f, libRadeonProRender64), rpr_status, (rpr_light, rpr_float, rpr_float, rpr_float), light, r, g, b)) end -function rprSphereLightSetRadius(light, angle) - check_error(ccall((:rprSphereLightSetRadius, libRadeonProRender64), rpr_status, (rpr_light, rpr_float), light, angle)) +function rprSphereLightSetRadius(light, radius) + check_error(ccall((:rprSphereLightSetRadius, libRadeonProRender64), rpr_status, (rpr_light, rpr_float), light, radius)) end function rprDiskLightSetRadiantPower3f(light, r, g, b) @@ -2000,9 +2010,9 @@ end function rprContextCreateDirectionalLight(context) out_light = Ref{rpr_light}() - #= C:\Users\sdani\SimiWorld\ProgrammerLife\MakieDev\dev\RadeonProRender\build\generate-master.jl:39 =# + #= /mnt/c/Users/sdani/SimiWorld/ProgrammerLife/MakieDev/dev/RadeonProRender/build/generate-master.jl:39 =# check_error(ccall((:rprContextCreateDirectionalLight, libRadeonProRender64), rpr_status, (rpr_context, Ptr{rpr_light}), context, out_light)) - #= C:\Users\sdani\SimiWorld\ProgrammerLife\MakieDev\dev\RadeonProRender\build\generate-master.jl:39 =# + #= /mnt/c/Users/sdani/SimiWorld/ProgrammerLife/MakieDev/dev/RadeonProRender/build/generate-master.jl:39 =# return out_light[] end @@ -2016,9 +2026,9 @@ end function rprContextCreateEnvironmentLight(context) out_light = Ref{rpr_light}() - #= C:\Users\sdani\SimiWorld\ProgrammerLife\MakieDev\dev\RadeonProRender\build\generate-master.jl:39 =# + #= /mnt/c/Users/sdani/SimiWorld/ProgrammerLife/MakieDev/dev/RadeonProRender/build/generate-master.jl:39 =# check_error(ccall((:rprContextCreateEnvironmentLight, libRadeonProRender64), rpr_status, (rpr_context, Ptr{rpr_light}), context, out_light)) - #= C:\Users\sdani\SimiWorld\ProgrammerLife\MakieDev\dev\RadeonProRender\build\generate-master.jl:39 =# + #= /mnt/c/Users/sdani/SimiWorld/ProgrammerLife/MakieDev/dev/RadeonProRender/build/generate-master.jl:39 =# return out_light[] end @@ -2044,17 +2054,17 @@ end function rprEnvironmentLightGetEnvironmentLightOverride(in_ibl, overrideType) out_iblOverride = Ref{rpr_light}() - #= C:\Users\sdani\SimiWorld\ProgrammerLife\MakieDev\dev\RadeonProRender\build\generate-master.jl:39 =# + #= /mnt/c/Users/sdani/SimiWorld/ProgrammerLife/MakieDev/dev/RadeonProRender/build/generate-master.jl:39 =# check_error(ccall((:rprEnvironmentLightGetEnvironmentLightOverride, libRadeonProRender64), rpr_status, (rpr_light, rpr_environment_override, Ptr{rpr_light}), in_ibl, overrideType, out_iblOverride)) - #= C:\Users\sdani\SimiWorld\ProgrammerLife\MakieDev\dev\RadeonProRender\build\generate-master.jl:39 =# + #= /mnt/c/Users/sdani/SimiWorld/ProgrammerLife/MakieDev/dev/RadeonProRender/build/generate-master.jl:39 =# return out_iblOverride[] end function rprContextCreateSkyLight(context) out_light = Ref{rpr_light}() - #= C:\Users\sdani\SimiWorld\ProgrammerLife\MakieDev\dev\RadeonProRender\build\generate-master.jl:39 =# + #= /mnt/c/Users/sdani/SimiWorld/ProgrammerLife/MakieDev/dev/RadeonProRender/build/generate-master.jl:39 =# check_error(ccall((:rprContextCreateSkyLight, libRadeonProRender64), rpr_status, (rpr_context, Ptr{rpr_light}), context, out_light)) - #= C:\Users\sdani\SimiWorld\ProgrammerLife\MakieDev\dev\RadeonProRender\build\generate-master.jl:39 =# + #= /mnt/c/Users/sdani/SimiWorld/ProgrammerLife/MakieDev/dev/RadeonProRender/build/generate-master.jl:39 =# return out_light[] end @@ -2156,9 +2166,9 @@ end function rprSceneGetEnvironmentLight(in_scene) out_light = Ref{rpr_light}() - #= C:\Users\sdani\SimiWorld\ProgrammerLife\MakieDev\dev\RadeonProRender\build\generate-master.jl:39 =# + #= /mnt/c/Users/sdani/SimiWorld/ProgrammerLife/MakieDev/dev/RadeonProRender/build/generate-master.jl:39 =# check_error(ccall((:rprSceneGetEnvironmentLight, libRadeonProRender64), rpr_status, (rpr_scene, Ptr{rpr_light}), in_scene, out_light)) - #= C:\Users\sdani\SimiWorld\ProgrammerLife\MakieDev\dev\RadeonProRender\build\generate-master.jl:39 =# + #= /mnt/c/Users/sdani/SimiWorld/ProgrammerLife/MakieDev/dev/RadeonProRender/build/generate-master.jl:39 =# return out_light[] end @@ -2172,9 +2182,9 @@ end function rprSceneGetBackgroundImage(scene) out_image = Ref{rpr_image}() - #= C:\Users\sdani\SimiWorld\ProgrammerLife\MakieDev\dev\RadeonProRender\build\generate-master.jl:39 =# + #= /mnt/c/Users/sdani/SimiWorld/ProgrammerLife/MakieDev/dev/RadeonProRender/build/generate-master.jl:39 =# check_error(ccall((:rprSceneGetBackgroundImage, libRadeonProRender64), rpr_status, (rpr_scene, Ptr{rpr_image}), scene, out_image)) - #= C:\Users\sdani\SimiWorld\ProgrammerLife\MakieDev\dev\RadeonProRender\build\generate-master.jl:39 =# + #= /mnt/c/Users/sdani/SimiWorld/ProgrammerLife/MakieDev/dev/RadeonProRender/build/generate-master.jl:39 =# return out_image[] end @@ -2184,9 +2194,9 @@ end function rprSceneGetCameraRight(scene) out_camera = Ref{rpr_camera}() - #= C:\Users\sdani\SimiWorld\ProgrammerLife\MakieDev\dev\RadeonProRender\build\generate-master.jl:39 =# + #= /mnt/c/Users/sdani/SimiWorld/ProgrammerLife/MakieDev/dev/RadeonProRender/build/generate-master.jl:39 =# check_error(ccall((:rprSceneGetCameraRight, libRadeonProRender64), rpr_status, (rpr_scene, Ptr{rpr_camera}), scene, out_camera)) - #= C:\Users\sdani\SimiWorld\ProgrammerLife\MakieDev\dev\RadeonProRender\build\generate-master.jl:39 =# + #= /mnt/c/Users/sdani/SimiWorld/ProgrammerLife/MakieDev/dev/RadeonProRender/build/generate-master.jl:39 =# return out_camera[] end @@ -2196,9 +2206,9 @@ end function rprSceneGetCamera(scene) out_camera = Ref{rpr_camera}() - #= C:\Users\sdani\SimiWorld\ProgrammerLife\MakieDev\dev\RadeonProRender\build\generate-master.jl:39 =# + #= /mnt/c/Users/sdani/SimiWorld/ProgrammerLife/MakieDev/dev/RadeonProRender/build/generate-master.jl:39 =# check_error(ccall((:rprSceneGetCamera, libRadeonProRender64), rpr_status, (rpr_scene, Ptr{rpr_camera}), scene, out_camera)) - #= C:\Users\sdani\SimiWorld\ProgrammerLife\MakieDev\dev\RadeonProRender\build\generate-master.jl:39 =# + #= /mnt/c/Users/sdani/SimiWorld/ProgrammerLife/MakieDev/dev/RadeonProRender/build/generate-master.jl:39 =# return out_camera[] end @@ -2228,33 +2238,33 @@ end function rprMaterialSystemGetInfo(in_material_system, type, in_size, in_data) out_size = Ref{Cint}() - #= C:\Users\sdani\SimiWorld\ProgrammerLife\MakieDev\dev\RadeonProRender\build\generate-master.jl:39 =# + #= /mnt/c/Users/sdani/SimiWorld/ProgrammerLife/MakieDev/dev/RadeonProRender/build/generate-master.jl:39 =# check_error(ccall((:rprMaterialSystemGetInfo, libRadeonProRender64), rpr_status, (rpr_material_system, rpr_material_system_info, Cint, Ptr{Cvoid}, Ptr{Cint}), in_material_system, type, in_size, in_data, out_size)) - #= C:\Users\sdani\SimiWorld\ProgrammerLife\MakieDev\dev\RadeonProRender\build\generate-master.jl:39 =# + #= /mnt/c/Users/sdani/SimiWorld/ProgrammerLife/MakieDev/dev/RadeonProRender/build/generate-master.jl:39 =# return out_size[] end function rprContextCreateMaterialSystem(in_context, type) out_matsys = Ref{rpr_material_system}() - #= C:\Users\sdani\SimiWorld\ProgrammerLife\MakieDev\dev\RadeonProRender\build\generate-master.jl:39 =# + #= /mnt/c/Users/sdani/SimiWorld/ProgrammerLife/MakieDev/dev/RadeonProRender/build/generate-master.jl:39 =# check_error(ccall((:rprContextCreateMaterialSystem, libRadeonProRender64), rpr_status, (rpr_context, rpr_material_system_type, Ptr{rpr_material_system}), in_context, type, out_matsys)) - #= C:\Users\sdani\SimiWorld\ProgrammerLife\MakieDev\dev\RadeonProRender\build\generate-master.jl:39 =# + #= /mnt/c/Users/sdani/SimiWorld/ProgrammerLife/MakieDev/dev/RadeonProRender/build/generate-master.jl:39 =# return out_matsys[] end function rprMaterialSystemGetSize(in_context) out_size = Ref{rpr_uint}() - #= C:\Users\sdani\SimiWorld\ProgrammerLife\MakieDev\dev\RadeonProRender\build\generate-master.jl:39 =# + #= /mnt/c/Users/sdani/SimiWorld/ProgrammerLife/MakieDev/dev/RadeonProRender/build/generate-master.jl:39 =# check_error(ccall((:rprMaterialSystemGetSize, libRadeonProRender64), rpr_status, (rpr_context, Ptr{rpr_uint}), in_context, out_size)) - #= C:\Users\sdani\SimiWorld\ProgrammerLife\MakieDev\dev\RadeonProRender\build\generate-master.jl:39 =# + #= /mnt/c/Users/sdani/SimiWorld/ProgrammerLife/MakieDev/dev/RadeonProRender/build/generate-master.jl:39 =# return out_size[] end function rprMaterialSystemCreateNode(in_matsys, in_type) out_node = Ref{rpr_material_node}() - #= C:\Users\sdani\SimiWorld\ProgrammerLife\MakieDev\dev\RadeonProRender\build\generate-master.jl:39 =# + #= /mnt/c/Users/sdani/SimiWorld/ProgrammerLife/MakieDev/dev/RadeonProRender/build/generate-master.jl:39 =# check_error(ccall((:rprMaterialSystemCreateNode, libRadeonProRender64), rpr_status, (rpr_material_system, rpr_material_node_type, Ptr{rpr_material_node}), in_matsys, in_type, out_node)) - #= C:\Users\sdani\SimiWorld\ProgrammerLife\MakieDev\dev\RadeonProRender\build\generate-master.jl:39 =# + #= /mnt/c/Users/sdani/SimiWorld/ProgrammerLife/MakieDev/dev/RadeonProRender/build/generate-master.jl:39 =# return out_node[] end @@ -2296,41 +2306,41 @@ end function rprMaterialNodeGetInfo(in_node, in_info, in_size, in_data) out_size = Ref{Cint}() - #= C:\Users\sdani\SimiWorld\ProgrammerLife\MakieDev\dev\RadeonProRender\build\generate-master.jl:39 =# + #= /mnt/c/Users/sdani/SimiWorld/ProgrammerLife/MakieDev/dev/RadeonProRender/build/generate-master.jl:39 =# check_error(ccall((:rprMaterialNodeGetInfo, libRadeonProRender64), rpr_status, (rpr_material_node, rpr_material_node_info, Cint, Ptr{Cvoid}, Ptr{Cint}), in_node, in_info, in_size, in_data, out_size)) - #= C:\Users\sdani\SimiWorld\ProgrammerLife\MakieDev\dev\RadeonProRender\build\generate-master.jl:39 =# + #= /mnt/c/Users/sdani/SimiWorld/ProgrammerLife/MakieDev/dev/RadeonProRender/build/generate-master.jl:39 =# return out_size[] end function rprMaterialNodeGetInputInfo(in_node, in_input_idx, in_info, in_size, in_data) out_size = Ref{Cint}() - #= C:\Users\sdani\SimiWorld\ProgrammerLife\MakieDev\dev\RadeonProRender\build\generate-master.jl:39 =# + #= /mnt/c/Users/sdani/SimiWorld/ProgrammerLife/MakieDev/dev/RadeonProRender/build/generate-master.jl:39 =# check_error(ccall((:rprMaterialNodeGetInputInfo, libRadeonProRender64), rpr_status, (rpr_material_node, rpr_int, rpr_material_node_input_info, Cint, Ptr{Cvoid}, Ptr{Cint}), in_node, in_input_idx, in_info, in_size, in_data, out_size)) - #= C:\Users\sdani\SimiWorld\ProgrammerLife\MakieDev\dev\RadeonProRender\build\generate-master.jl:39 =# + #= /mnt/c/Users/sdani/SimiWorld/ProgrammerLife/MakieDev/dev/RadeonProRender/build/generate-master.jl:39 =# return out_size[] end function rprContextCreateComposite(context, in_type) out_composite = Ref{rpr_composite}() - #= C:\Users\sdani\SimiWorld\ProgrammerLife\MakieDev\dev\RadeonProRender\build\generate-master.jl:39 =# + #= /mnt/c/Users/sdani/SimiWorld/ProgrammerLife/MakieDev/dev/RadeonProRender/build/generate-master.jl:39 =# check_error(ccall((:rprContextCreateComposite, libRadeonProRender64), rpr_status, (rpr_context, rpr_composite_type, Ptr{rpr_composite}), context, in_type, out_composite)) - #= C:\Users\sdani\SimiWorld\ProgrammerLife\MakieDev\dev\RadeonProRender\build\generate-master.jl:39 =# + #= /mnt/c/Users/sdani/SimiWorld/ProgrammerLife/MakieDev/dev/RadeonProRender/build/generate-master.jl:39 =# return out_composite[] end function rprContextCreateLUTFromFile(context, fileLutPath) out_lut = Ref{rpr_lut}() - #= C:\Users\sdani\SimiWorld\ProgrammerLife\MakieDev\dev\RadeonProRender\build\generate-master.jl:39 =# + #= /mnt/c/Users/sdani/SimiWorld/ProgrammerLife/MakieDev/dev/RadeonProRender/build/generate-master.jl:39 =# check_error(ccall((:rprContextCreateLUTFromFile, libRadeonProRender64), rpr_status, (rpr_context, Ptr{rpr_char}, Ptr{rpr_lut}), context, fileLutPath, out_lut)) - #= C:\Users\sdani\SimiWorld\ProgrammerLife\MakieDev\dev\RadeonProRender\build\generate-master.jl:39 =# + #= /mnt/c/Users/sdani/SimiWorld/ProgrammerLife/MakieDev/dev/RadeonProRender/build/generate-master.jl:39 =# return out_lut[] end function rprContextCreateLUTFromData(context, lutData) out_lut = Ref{rpr_lut}() - #= C:\Users\sdani\SimiWorld\ProgrammerLife\MakieDev\dev\RadeonProRender\build\generate-master.jl:39 =# + #= /mnt/c/Users/sdani/SimiWorld/ProgrammerLife/MakieDev/dev/RadeonProRender/build/generate-master.jl:39 =# check_error(ccall((:rprContextCreateLUTFromData, libRadeonProRender64), rpr_status, (rpr_context, Ptr{rpr_char}, Ptr{rpr_lut}), context, lutData, out_lut)) - #= C:\Users\sdani\SimiWorld\ProgrammerLife\MakieDev\dev\RadeonProRender\build\generate-master.jl:39 =# + #= /mnt/c/Users/sdani/SimiWorld/ProgrammerLife/MakieDev/dev/RadeonProRender/build/generate-master.jl:39 =# return out_lut[] end @@ -2384,9 +2394,9 @@ end function rprContextCreatePostEffect(context, type) out_effect = Ref{rpr_post_effect}() - #= C:\Users\sdani\SimiWorld\ProgrammerLife\MakieDev\dev\RadeonProRender\build\generate-master.jl:39 =# + #= /mnt/c/Users/sdani/SimiWorld/ProgrammerLife/MakieDev/dev/RadeonProRender/build/generate-master.jl:39 =# check_error(ccall((:rprContextCreatePostEffect, libRadeonProRender64), rpr_status, (rpr_context, rpr_post_effect_type, Ptr{rpr_post_effect}), context, type, out_effect)) - #= C:\Users\sdani\SimiWorld\ProgrammerLife\MakieDev\dev\RadeonProRender\build\generate-master.jl:39 =# + #= /mnt/c/Users/sdani/SimiWorld/ProgrammerLife/MakieDev/dev/RadeonProRender/build/generate-master.jl:39 =# return out_effect[] end @@ -2420,9 +2430,9 @@ end function rprContextGetAttachedPostEffect(context, i) out_effect = Ref{rpr_post_effect}() - #= C:\Users\sdani\SimiWorld\ProgrammerLife\MakieDev\dev\RadeonProRender\build\generate-master.jl:39 =# + #= /mnt/c/Users/sdani/SimiWorld/ProgrammerLife/MakieDev/dev/RadeonProRender/build/generate-master.jl:39 =# check_error(ccall((:rprContextGetAttachedPostEffect, libRadeonProRender64), rpr_status, (rpr_context, rpr_uint, Ptr{rpr_post_effect}), context, i, out_effect)) - #= C:\Users\sdani\SimiWorld\ProgrammerLife\MakieDev\dev\RadeonProRender\build\generate-master.jl:39 =# + #= /mnt/c/Users/sdani/SimiWorld/ProgrammerLife/MakieDev/dev/RadeonProRender/build/generate-master.jl:39 =# return out_effect[] end @@ -2436,9 +2446,9 @@ end function rprContextCreateHeteroVolume(context) out_heteroVolume = Ref{rpr_hetero_volume}() - #= C:\Users\sdani\SimiWorld\ProgrammerLife\MakieDev\dev\RadeonProRender\build\generate-master.jl:39 =# + #= /mnt/c/Users/sdani/SimiWorld/ProgrammerLife/MakieDev/dev/RadeonProRender/build/generate-master.jl:39 =# check_error(ccall((:rprContextCreateHeteroVolume, libRadeonProRender64), rpr_status, (rpr_context, Ptr{rpr_hetero_volume}), context, out_heteroVolume)) - #= C:\Users\sdani\SimiWorld\ProgrammerLife\MakieDev\dev\RadeonProRender\build\generate-master.jl:39 =# + #= /mnt/c/Users/sdani/SimiWorld/ProgrammerLife/MakieDev/dev/RadeonProRender/build/generate-master.jl:39 =# return out_heteroVolume[] end @@ -2490,11 +2500,11 @@ const RPR_VERSION_MAJOR = 2 const RPR_VERSION_MINOR = 2 -const RPR_VERSION_REVISION = 12 +const RPR_VERSION_REVISION = 17 -const RPR_VERSION_BUILD = 0x4382e327 +const RPR_VERSION_BUILD = 0xc1dd1d1b -const RPR_VERSION_MAJOR_MINOR_REVISION = 0x00200212 +const RPR_VERSION_MAJOR_MINOR_REVISION = 0x00200217 const RPR_API_VERSION = RPR_VERSION_MAJOR_MINOR_REVISION diff --git a/src/highlevel-api.jl b/src/highlevel-api.jl index 72b8343..7fa8e1a 100644 --- a/src/highlevel-api.jl +++ b/src/highlevel-api.jl @@ -258,7 +258,6 @@ This is kind of magical and still under investigation. MWE: https://gist.github.com/SimonDanisch/475064ae102141554f65e926f3070630 =# -@nospecialize function Shape(context::Context, vertices, normals, faces, uvs) @assert length(vertices) == length(normals) @assert length(vertices) == length(uvs) @@ -275,7 +274,6 @@ function Shape(context::Context, vertices, normals, faces, uvs) @assert eltype(uvraw) == Vec2f foreach(i -> checkbounds(vertices, i + 1), iraw) - yield() # grrr, why you!! rpr_mesh = rprContextCreateMesh(context, vraw, length(vertices), sizeof(Point3f), nraw, length(normals), sizeof(Vec3f), uvraw, length(uvs), sizeof(Vec2f), iraw, sizeof(rpr_int), iraw, sizeof(rpr_int), iraw, sizeof(rpr_int), facelens, length(faces)) @@ -285,7 +283,6 @@ function Shape(context::Context, vertices, normals, faces, uvs) add_to_context!(context, shape) return shape end -@specialize """ Creating a shape from a shape is interpreted as creating an instance.