tutorial clean and improve for Northstar

Author: RichardGe

tutorials/01_camera_setup/main.cpp

@@ -127,10 +127,8 @@ int main()
 	}
 
 	// Progressively render an image
-	for (int i = 0; i < NUM_ITERATIONS; ++i)
-	{
-		CHECK( rprContextRender(context) );
-	}
+	CHECK(rprContextSetParameterByKey1u(context,RPR_CONTEXT_ITERATIONS,NUM_ITERATIONS));
+	CHECK( rprContextRender(context) );
 
 	std::cout << "Rendering finished.\n";
 

tutorials/02_mesh/main.cpp

@@ -137,10 +137,8 @@ int main()
 	}
 
 	// Progressively render an image
-	for (int i = 0; i < NUM_ITERATIONS; ++i)
-	{
-		CHECK( rprContextRender(context) );
-	}
+	CHECK(rprContextSetParameterByKey1u(context,RPR_CONTEXT_ITERATIONS,NUM_ITERATIONS));
+	CHECK( rprContextRender(context) );
 
 	std::cout << "Rendering finished.\n";
 

tutorials/03_instance/main.cpp

@@ -25,9 +25,9 @@ int main()
 	//	set this before any rpr API calls
 //	rprContextSetParameterByKey1u(0,RPR_CONTEXT_TRACING_ENABLED,1);
 
-    std::cout << "Radeon ProRender SDK simple rendering tutorial.\n";
-    // Indicates whether the last operation has suceeded or not
-    rpr_int status = RPR_SUCCESS;
+	std::cout << "Radeon ProRender SDK simple rendering tutorial.\n";
+	// Indicates whether the last operation has suceeded or not
+	rpr_int status = RPR_SUCCESS;
 	// Create OpenCL context using a single GPU 
 	rpr_context context = NULL;
 
@@ -59,7 +59,7 @@ int main()
 	rpr_scene scene=nullptr;
 	CHECK( rprContextCreateScene(context, &scene) );
 
-    // Create cube mesh
+	// Create cube mesh
 	rpr_shape cube=nullptr;
 	{
 		CHECK( rprContextCreateMesh(context,
@@ -80,7 +80,7 @@ int main()
 		// Set the transform 
 		CHECK( rprShapeSetTransform(cube, RPR_TRUE, &m.m00) );
 	}
-    // Create plane mesh
+	// Create plane mesh
 	rpr_shape plane=nullptr;
 	{
 		CHECK( rprContextCreateMesh(context,
@@ -95,7 +95,7 @@ int main()
 		// Add plane into the scene
 		CHECK( rprSceneAttachShape(scene, plane) );
 	}
-    // Create camera
+	// Create camera
 	rpr_camera camera=nullptr;
 	{
 		CHECK( rprContextCreateCamera(context, &camera) );
@@ -111,24 +111,24 @@ int main()
 		// Set camera for the scene
 		CHECK( rprSceneSetCamera(scene, camera) );
 	}
-    // Set scene to render for the context
-    CHECK( rprContextSetScene(context, scene) );
+	// Set scene to render for the context
+	CHECK( rprContextSetScene(context, scene) );
 
-    // Create framebuffer to store rendering result
-    rpr_framebuffer_desc desc;
-    desc.fb_width = 800;
-    desc.fb_height = 600;
+	// Create framebuffer to store rendering result
+	rpr_framebuffer_desc desc;
+	desc.fb_width = 800;
+	desc.fb_height = 600;
 
-    // 4 component 32-bit float value each
-    rpr_framebuffer_format fmt = {4, RPR_COMPONENT_TYPE_FLOAT32};
+	// 4 component 32-bit float value each
+	rpr_framebuffer_format fmt = {4, RPR_COMPONENT_TYPE_FLOAT32};
 	rpr_framebuffer frame_buffer;
 	CHECK( rprContextCreateFrameBuffer(context, fmt, &desc, &frame_buffer) );
 
-    // Clear framebuffer to black color
-    CHECK( rprFrameBufferClear(frame_buffer) );
+	// Clear framebuffer to black color
+	CHECK( rprFrameBufferClear(frame_buffer) );
 
-    // Set framebuffer for the context
-    CHECK( rprContextSetAOV(context, RPR_AOV_COLOR, frame_buffer) );
+	// Set framebuffer for the context
+	CHECK( rprContextSetAOV(context, RPR_AOV_COLOR, frame_buffer) );
 
 	CHECK( rprContextSetParameterByKey1u(context, RPR_CONTEXT_RENDER_MODE, RPR_RENDER_MODE_NORMAL) );
 
@@ -149,28 +149,26 @@ int main()
 		CHECK(rprSceneAttachShape(scene, instance));
 	}
 
-    // Progressively render an image
-    for (int i = 0; i < NUM_ITERATIONS; ++i)
-    {
-        CHECK( rprContextRender(context) );
-    }
+	// Progressively render an image
+	CHECK(rprContextSetParameterByKey1u(context,RPR_CONTEXT_ITERATIONS,NUM_ITERATIONS));
+	CHECK( rprContextRender(context) );
 
-    std::cout << "Rendering finished.\n";
+	std::cout << "Rendering finished.\n";
 
-    // Save the result to file
-    CHECK( rprFrameBufferSaveToFile(frame_buffer, "03.png") );
+	// Save the result to file
+	CHECK( rprFrameBufferSaveToFile(frame_buffer, "03.png") );
 
-    // Release the stuff we created
+	// Release the stuff we created
 	CHECK(rprObjectDelete(matsys));matsys=nullptr;
-    CHECK(rprObjectDelete(plane));plane=nullptr;
+	CHECK(rprObjectDelete(plane));plane=nullptr;
 	CHECK(rprObjectDelete(cube));cube=nullptr;
 	CHECK(rprObjectDelete(instance));instance=nullptr;
 	CHECK(rprObjectDelete(scene));scene=nullptr;
 	CHECK(rprObjectDelete(camera));camera=nullptr;
 	CHECK(rprObjectDelete(frame_buffer));frame_buffer=nullptr;
 	CheckNoLeak(context);
 	CHECK(rprObjectDelete(context));context=nullptr; // Always delete the RPR Context in last.
-    return 0;
+	return 0;
 }
 
 

tutorials/10_light_point/main.cpp

@@ -142,9 +142,7 @@ int main()
 	}
 
 	// Create framebuffer to store rendering result
-	rpr_framebuffer_desc desc;
-	desc.fb_width = 800;
-	desc.fb_height = 600;
+	rpr_framebuffer_desc desc = { 800,600 };
 
 	// 4 component 32-bit float value each
 	rpr_framebuffer_format fmt = {4, RPR_COMPONENT_TYPE_FLOAT32};
@@ -178,10 +176,8 @@ int main()
 	}
 
 	// Progressively render an image
-	for (int i = 0; i < NUM_ITERATIONS; ++i)
-	{
-		CHECK( rprContextRender(context) );
-	}
+	CHECK(rprContextSetParameterByKey1u(context,RPR_CONTEXT_ITERATIONS,NUM_ITERATIONS));
+	CHECK( rprContextRender(context) );
 
 	std::cout << "Rendering finished.\n";
 

tutorials/11_light_mesh/main.cpp

@@ -130,9 +130,7 @@ int main()
 	}
 
 	// Create framebuffer to store rendering result
-	rpr_framebuffer_desc desc;
-	desc.fb_width = 800;
-	desc.fb_height = 600;
+	rpr_framebuffer_desc desc = { 800,600 };
 
 	// 4 component 32-bit float value each
 	rpr_framebuffer_format fmt = {4, RPR_COMPONENT_TYPE_FLOAT32};
@@ -153,7 +151,8 @@ int main()
 	///////// Tutorial Emissive Light //////////
 
 	// Create the light
-	rpr_shape light;
+	rpr_shape light = nullptr;
+	rpr_material_node emissive = nullptr;
 	{
 		CHECK( rprContextCreateMesh(context,
 			(rpr_float const*)&plane_data[0], 4, sizeof(vertex),
@@ -170,7 +169,6 @@ int main()
 		// Set transform for the light
 		CHECK( rprShapeSetTransform(light, RPR_TRUE, &lightm.m00) );
 
-		rpr_material_node emissive;
 		{
 			CHECK( rprMaterialSystemCreateNode(matsys, RPR_MATERIAL_NODE_EMISSIVE, &emissive) );
 
@@ -186,17 +184,16 @@ int main()
 	}
 
 	// Progressively render an image
-	for (int i = 0; i < NUM_ITERATIONS; ++i)
-	{
-		CHECK( rprContextRender(context) );
-	}
+	CHECK(rprContextSetParameterByKey1u(context,RPR_CONTEXT_ITERATIONS,NUM_ITERATIONS));
+	CHECK( rprContextRender(context) );
 
 	std::cout << "Rendering finished.\n";
 
 	// Save the result to file
 	CHECK( rprFrameBufferSaveToFile(frame_buffer, "11.png") );
 
 	// Release the stuff we created
+	CHECK(rprObjectDelete(emissive));
 	CHECK(rprObjectDelete(matsys));
 	CHECK(rprObjectDelete(plane));
 	CHECK(rprObjectDelete(cube));

tutorials/12_light_environment/main.cpp

@@ -141,9 +141,7 @@ int main()
 	}
 
 	// Create framebuffer to store rendering result
-	rpr_framebuffer_desc desc;
-	desc.fb_width = 800;
-	desc.fb_height = 600;
+	rpr_framebuffer_desc desc = { 800,600 };
 
 	// 4 component 32-bit float value each
 	rpr_framebuffer_format fmt = {4, RPR_COMPONENT_TYPE_FLOAT32};
@@ -181,10 +179,8 @@ int main()
 	}
 
 	// Progressively render an image
-	for (int i = 0; i < NUM_ITERATIONS; ++i)
-	{
-		CHECK( rprContextRender(context) );
-	}
+	CHECK(rprContextSetParameterByKey1u(context,RPR_CONTEXT_ITERATIONS,NUM_ITERATIONS));
+	CHECK( rprContextRender(context) );
 
 	std::cout << "Rendering finished.\n";
 

tutorials/20_material_textured/main.cpp

@@ -162,9 +162,7 @@ int main()
 	}
 
 	// Create framebuffer to store rendering result
-	rpr_framebuffer_desc desc;
-	desc.fb_width = 800;
-	desc.fb_height = 600;
+	rpr_framebuffer_desc desc = { 800,600 };
 
 	// 4 component 32-bit float value each
 	rpr_framebuffer_format fmt = {4, RPR_COMPONENT_TYPE_FLOAT32};
@@ -208,10 +206,8 @@ int main()
 	}
 
 	// Progressively render an image
-	for (int i = 0; i < NUM_ITERATIONS; ++i)
-	{
-		CHECK( rprContextRender(context) );
-	}
+	CHECK(rprContextSetParameterByKey1u(context,RPR_CONTEXT_ITERATIONS,NUM_ITERATIONS));
+	CHECK( rprContextRender(context) );
 
 	std::cout << "Rendering finished.\n";
 

tutorials/21_material_layered/main.cpp

@@ -164,9 +164,7 @@ int main()
 
 
 	// Create framebuffer to store rendering result
-	rpr_framebuffer_desc desc;
-	desc.fb_width = 800;
-	desc.fb_height = 600;
+	rpr_framebuffer_desc desc = { 800,600 };
 
 	// 4 component 32-bit float value each
 	rpr_framebuffer_format fmt = {4, RPR_COMPONENT_TYPE_FLOAT32};
@@ -230,10 +228,8 @@ int main()
 
 
 	// Progressively render an image
-	for (int i = 0; i < NUM_ITERATIONS; ++i)
-	{
-		CHECK( rprContextRender(context) );
-	}
+	CHECK(rprContextSetParameterByKey1u(context,RPR_CONTEXT_ITERATIONS,NUM_ITERATIONS));
+	CHECK( rprContextRender(context) );
 
 	std::cout << "Rendering finished.\n";
 

tutorials/22_material_uber/main.cpp

@@ -20,6 +20,20 @@
 #include <cassert>
 #include <iostream>
 
+struct UPDATE_CALLBACK_DATA
+{
+	// developpers fill it as he wants
+	// ...
+	// ...
+};
+
+void UpdateCallback( float progress, void* userData )
+{
+	UPDATE_CALLBACK_DATA* userDataIn = (UPDATE_CALLBACK_DATA*)userData;
+	std::cout <<  "progress = "<< (int)(progress*100) << "%" << std::endl;
+	return;
+}
+
 int main()
 {
 	//	enable Radeon ProRender API trace
@@ -41,6 +55,11 @@ int main()
 	// Create context using a single GPU 
 	CHECK( rprCreateContext(RPR_API_VERSION, plugins, pluginCount, RPR_CREATION_FLAGS_ENABLE_GPU0, NULL, NULL, &context) );
 
+	UPDATE_CALLBACK_DATA dataCallback;
+
+	CHECK( rprContextSetParameterByKeyPtr(context, RPR_CONTEXT_RENDER_UPDATE_CALLBACK_FUNC, (void*)UpdateCallback));
+	CHECK( rprContextSetParameterByKeyPtr(context, RPR_CONTEXT_RENDER_UPDATE_CALLBACK_DATA, &dataCallback));
+
 	// Set active plugin.
 	CHECK(  rprContextSetActivePlugin(context, plugins[0]) );
 
@@ -163,14 +182,14 @@ int main()
 
 
 	// Create framebuffer to store rendering result
-	rpr_framebuffer_desc desc;
-	desc.fb_width = 800;
-	desc.fb_height = 600;
+	rpr_framebuffer_desc desc = { 800,600 };
 
 	// 4 component 32-bit float value each
 	rpr_framebuffer_format fmt = {4, RPR_COMPONENT_TYPE_FLOAT32};
-	rpr_framebuffer frame_buffer;
+	rpr_framebuffer frame_buffer = nullptr;
+	rpr_framebuffer frame_buffer_resolved = nullptr;
 	CHECK( rprContextCreateFrameBuffer(context, fmt, &desc, &frame_buffer) );
+	CHECK( rprContextCreateFrameBuffer(context, fmt, &desc, &frame_buffer_resolved) );
 
 	// Clear framebuffer to black color
 	CHECK( rprFrameBufferClear(frame_buffer) );
@@ -195,15 +214,14 @@ int main()
 	}
 
 	// Progressively render an image
-	for (int i = 0; i < NUM_ITERATIONS; ++i)
-	{
-		CHECK( rprContextRender(context) );
-	}
+	CHECK(rprContextSetParameterByKey1u(context,RPR_CONTEXT_ITERATIONS,NUM_ITERATIONS));
+	CHECK( rprContextRender(context) );
+	CHECK(rprContextResolveFrameBuffer(context,frame_buffer,frame_buffer_resolved,true));
 
 	std::cout << "Rendering finished.\n";
 
 	// Save the result to file
-	CHECK( rprFrameBufferSaveToFile(frame_buffer, "22.png") );
+	CHECK( rprFrameBufferSaveToFile(frame_buffer_resolved, "22.png") );
 
 	// Release the stuff we created
 	CHECK(rprObjectDelete(img));img=nullptr;
@@ -217,12 +235,9 @@ int main()
 	CHECK(rprObjectDelete(scene));scene=nullptr;
 	CHECK(rprObjectDelete(camera));camera=nullptr;
 	CHECK(rprObjectDelete(frame_buffer));frame_buffer=nullptr;
+	CHECK(rprObjectDelete(frame_buffer_resolved));frame_buffer_resolved=nullptr;
 	CheckNoLeak(context);
 	CHECK(rprObjectDelete(context));context=nullptr; // Always delete the RPR Context in last.
 	return 0;
 }
 
-
-// Things to try in this tutorial:
-// 1) Did you notice the x after rpr (rprxCreateMaterial), rprx use rpr, don't get confuse
-// 2) Try to play with the UBER material properties look into RprSupport.h and apply it on the cube