use LaunchParameter<Integrator>

instead of LaunchParamsIntegrator

.gitmodules

@@ -1,23 +1,23 @@
 [submodule "src/ext/assimp"]
 	path = src/ext/assimp
-	url = https://github.com/assimp/assimp.git
+	url = git@github.com:assimp/assimp.git
 [submodule "src/ext/glfw"]
 	path = src/ext/glfw
-	url = https://github.com/glfw/glfw.git
+	url = git@github.com:glfw/glfw.git
 [submodule "src/ext/pybind11"]
 	path = src/ext/pybind11
-	url = https://github.com/pybind/pybind11.git
+	url = git@github.com:pybind/pybind11.git
 	branch = stable
 [submodule "src/ext/pbrtparser"]
 	path = src/ext/pbrtparser
-	url = https://github.com/cuteday/pbrt-parser.git
+	url = git@github.com:cuteday/pbrt-parser.git
 	branch = cute
 [submodule "src/core/math/3rdparty/eigen"]
 	path = src/core/math/3rdparty/eigen
-	url = https://github.com/cuteday/Eigen.git
+	url = git@github.com:cuteday/Eigen.git
 [submodule "src/ext/nvrhi"]
 	path = src/ext/nvrhi
-	url = https://github.com/cuteday/nvrhi.git
+	url = git@github.com:cuteday/nvrhi.git
 [submodule "src/ext/openvdb"]
 	path = src/ext/openvdb
-	url = https://github.com/cuteday/openvdb_win.git
+	url = git@github.com:cuteday/openvdb_win.git

src/core/camera.h

@@ -25,22 +25,29 @@ class Camera {
 		Vector3f u{ 1, 0, 0 };					// camera right		[dependent to aspect ratio]
 		Vector3f v{ 0, 1, 0 };					// camera up		[dependent to aspect ratio]
 		Vector3f w{ 0, 0, -1 };					// camera forward
+
+		Medium medium{nullptr};					// the ray is inside the medium
 
 		KRR_CALLABLE Ray getRay(Vector2i pixel, Vector2i frameSize, Sampler& sampler) {
 			Ray ray;
 			/* 1. Statified sample on the film plane (within the fragment) */
-			Vector2f p = (Vector2f)pixel + Vector2f(0.5f) + sampler.get2D(); // uniform sample + box filter
-			Vector2f ndc = Vector2f(2 * p) / Vector2f(frameSize) + Vector2f(-1.f); // ndc in [-1, 1]^2
-			if (lensRadius > 0) {			/*Thin lens*/
+			Vector2f p =
+				(Vector2f) pixel + Vector2f(0.5f) + sampler.get2D(); // uniform sample + box filter
+			Vector2f ndc =
+				Vector2f(2 * p) / Vector2f(frameSize) + Vector2f(-1.f); // ndc in [-1, 1]^2
+			if (lensRadius > 0) {										/*Thin lens*/
 				/* 2. Sample the lens (uniform) */
 				Vector3f focalPoint = pos + ndc[0] * u + ndc[1] * v + w;
-				Vector2f apertureSample = lensRadius > M_EPSILON ? uniformSampleDisk(sampler.get2D()) : Vector2f::Zero();
-				ray.origin = pos + lensRadius * (apertureSample[0] * normalize(u) + apertureSample[1] * normalize(v));
-				ray.dir = normalize(focalPoint - ray.origin);
-			} else {							/*Pin hole*/
+				Vector2f apertureSample =
+					lensRadius > M_EPSILON ? uniformSampleDisk(sampler.get2D()) : Vector2f::Zero();
+				ray.origin = pos + lensRadius * (apertureSample[0] * normalize(u) +
+												 apertureSample[1] * normalize(v));
+				ray.dir	   = normalize(focalPoint - ray.origin);
+			} else { /*Pin hole*/
 				ray.origin = pos;
-				ray.dir = normalize(ndc[0] * u + ndc[1] * v + w);
+				ray.dir	   = normalize(ndc[0] * u + ndc[1] * v + w);
 			}
+			ray.medium = medium;
 			return ray;
 		}
 

src/core/device/optix.h

@@ -90,17 +90,19 @@ class OptixBackend {
 
 	void initialize(const OptixInitializeParameters& params);
 	void setScene(std::shared_ptr<Scene> _scene);
-	template <typename T>
-	void launch(const T& parameters, string entryPoint, int width,
-		int height, int depth = 1) {
+	template <typename Integrator>
+	void launch(const LaunchParameters<Integrator>& parameters, string entryPoint, 
+		int width, int height, int depth = 1) {
 		if (height * width * depth == 0) return;
-		static T *launchParams{nullptr};
-		if (!launchParams) cudaMalloc(&launchParams, sizeof(T));
+		static LaunchParameters<Integrator> *launchParams{nullptr};
+		if (!launchParams) cudaMalloc(&launchParams, sizeof(LaunchParameters<Integrator>));
 		if (!entryPoints.count(entryPoint))
 			Log(Fatal, "The entrypoint %s is not initialized!", entryPoint.c_str());
-		cudaMemcpyAsync(launchParams, &parameters, sizeof(T), cudaMemcpyHostToDevice, cudaStream);
-		OPTIX_CHECK(optixLaunch(optixPipeline, cudaStream, CUdeviceptr(launchParams), 
-			sizeof(T), &SBT[entryPoints[entryPoint]], width, height, depth));
+		cudaMemcpyAsync(launchParams, &parameters, sizeof(LaunchParameters<Integrator>),
+						cudaMemcpyHostToDevice, cudaStream);
+		OPTIX_CHECK(optixLaunch(optixPipeline, cudaStream, CUdeviceptr(launchParams),
+								sizeof(LaunchParameters<Integrator>), &SBT[entryPoints[entryPoint]],
+								width, height, depth));
 	}
 
 	std::shared_ptr<Scene> getScene() const { return scene; }

src/core/device/scene.h

@@ -90,4 +90,7 @@ class RTScene {
 	std::shared_ptr<OptixScene> mOptixScene;
 };
 
+template <typename Integrator> 
+struct LaunchParameters {};
+
 KRR_NAMESPACE_END

src/main/kiraray.cpp

@@ -14,7 +14,7 @@ extern "C" int main(int argc, char *argv[]) {
 			   "Switch to Release build for normal performance!");
 #endif
 
-	string configFile = "common/configs/example_cbox.json";
+	string configFile = "common/configs/example_volbox.json";
 	if (argc < 2){
 		Log(Warning, "No config file specified, using default config file: %s", configFile.c_str());
 	} else {

src/misc/render/ppg/device.cu

@@ -8,7 +8,7 @@
 using namespace krr;
 KRR_NAMESPACE_BEGIN
 
-extern "C" __constant__ LaunchParamsPPG launchParams;
+extern "C" __constant__ LaunchParameters<PPGPathTracer> launchParams;
 
 template <typename... Args>
 KRR_DEVICE_FUNCTION void traceRay(OptixTraversableHandle traversable, Ray ray,

src/misc/render/ppg/integrator.cpp

@@ -75,7 +75,7 @@ void PPGPathTracer::initialize() {
 
 void PPGPathTracer::traceClosest(int depth) {
 	PROFILE("Trace intersect rays");
-	static LaunchParamsPPG params = {};
+	static LaunchParameters<PPGPathTracer> params = {};
 	params.traversable			  = backend->getRootTraversable();
 	params.sceneData			  = backend->getSceneData();
 	params.colorSpace			  = KRR_DEFAULT_COLORSPACE;
@@ -91,7 +91,7 @@ void PPGPathTracer::traceClosest(int depth) {
 
 void PPGPathTracer::traceShadow() {
 	PROFILE("Trace shadow rays");
-	static LaunchParamsPPG params = {};
+	static LaunchParameters<PPGPathTracer> params = {};
 	params.traversable			  = backend->getRootTraversable();
 	params.sceneData			  = backend->getSceneData();
 	params.colorSpace			  = KRR_DEFAULT_COLORSPACE;

src/misc/render/ppg/ppg.h

@@ -4,7 +4,10 @@
 
 KRR_NAMESPACE_BEGIN
 
-typedef struct {
+class PPGPathTracer;
+
+template <> 
+struct LaunchParameters<PPGPathTracer> {
 	RayQueue* currentRayQueue;
 	RayQueue* nextRayQueue;
 	ShadowRayQueue* shadowRayQueue;
@@ -19,6 +22,6 @@ typedef struct {
 	rt::SceneData sceneData;
 	GuidedPathStateBuffer* guidedState;
 	OptixTraversableHandle traversable;
-} LaunchParamsPPG;
+};
 
 KRR_NAMESPACE_END

src/misc/render/zero_guiding/device.cu

@@ -8,7 +8,7 @@
 using namespace krr;
 KRR_NAMESPACE_BEGIN
 
-extern "C" __constant__ LaunchParamsZero launchParams;
+extern "C" __constant__ LaunchParameters<ZeroGuidingPT> launchParams;
 
 template <typename... Args>
 KRR_DEVICE_FUNCTION void traceRay(OptixTraversableHandle traversable, Ray ray,

src/misc/render/zero_guiding/integrator.cpp

@@ -74,7 +74,7 @@ void ZeroGuidingPT::initialize() {
 
 void ZeroGuidingPT::traceClosest(int depth) {
 	PROFILE("Trace intersect rays");
-	static LaunchParamsZero params = {};
+	static LaunchParameters<ZeroGuidingPT> params = {};
 	params.traversable			  = backend->getRootTraversable();
 	params.sceneData			  = backend->getSceneData();
 	params.colorSpace			  = KRR_DEFAULT_COLORSPACE;
@@ -90,7 +90,7 @@ void ZeroGuidingPT::traceClosest(int depth) {
 
 void ZeroGuidingPT::traceShadow() {
 	PROFILE("Trace shadow rays");
-	static LaunchParamsZero params = {};
+	static LaunchParameters<ZeroGuidingPT> params = {};
 	params.traversable			  = backend->getRootTraversable();
 	params.sceneData			  = backend->getSceneData();
 	params.colorSpace			  = KRR_DEFAULT_COLORSPACE;

src/misc/render/zero_guiding/zeroguiding.h

@@ -4,7 +4,10 @@
 
 KRR_NAMESPACE_BEGIN
 
-typedef struct {
+class ZeroGuidingPT;
+
+template <> 
+struct LaunchParameters<ZeroGuidingPT> {
 	RayQueue* currentRayQueue;
 	RayQueue* nextRayQueue;
 	ShadowRayQueue* shadowRayQueue;
@@ -19,6 +22,6 @@ typedef struct {
 	rt::SceneData sceneData;
 	GuidedPathStateBuffer* guidedState;
 	OptixTraversableHandle traversable;
-} LaunchParamsZero;
+};
 
 KRR_NAMESPACE_END

src/render/bdpt/bdpt.h

@@ -10,8 +10,10 @@
 KRR_NAMESPACE_BEGIN
 
 using namespace shader;
+class BDPTIntegrator;
 
-struct LaunchParamsBDPT {
+template <> 
+struct LaunchParameters<BDPTIntegrator> {
 	uint frameID{ 0 };
 	Vector2i fbSize = Vector2i::Zero();
 	bool debugOutput	= false;

src/render/bdpt/integrator.cpp

@@ -9,7 +9,7 @@ KRR_NAMESPACE_BEGIN
 extern "C" char BDPT_PTX[];
 
 namespace {
-	LaunchParamsBDPT *launchParamsDevice{};
+	LaunchParameters<BDPTIntegrator> *launchParamsDevice{};
 }
 
 BDPTIntegrator::BDPTIntegrator() {

src/render/bdpt/integrator.h

@@ -33,7 +33,7 @@ class BDPTIntegrator: public RenderPass{
 	OptixPipeline               pipeline;
 	OptixModule                 module;
 
-	LaunchParamsBDPT launchParams;
+	LaunchParameters<BDPTIntegrator> launchParams;
 };
 
 KRR_NAMESPACE_END

src/render/passes/gbuffer/device.cu

@@ -7,7 +7,7 @@
 using namespace krr;
 KRR_NAMESPACE_BEGIN
 
-extern "C" __constant__ LaunchParamsGBuffer launchParams;
+extern "C" __constant__ LaunchParameters <GBufferPass> launchParams;
 
 template <typename... Args>
 KRR_DEVICE_FUNCTION void traceRay(OptixTraversableHandle traversable, Ray ray, float tMax,

src/render/passes/gbuffer/device.h

@@ -6,13 +6,16 @@
 
 KRR_NAMESPACE_BEGIN
 
-typedef struct {
+class GBufferPass;
+
+template <> 
+struct LaunchParameters<GBufferPass> {
 	Vector2i frameSize;
 	size_t frameIndex;
 
 	rt::SceneData sceneData;
 	Camera::CameraData cameraData;
 	OptixTraversableHandle traversable;
-} LaunchParamsGBuffer;
+};
 
 KRR_NAMESPACE_END

src/render/passes/gbuffer/gbuffer.cpp

@@ -23,7 +23,7 @@ void GBufferPass::setScene(Scene::SharedPtr scene) {
 
 void GBufferPass::render(RenderContext* context) {
 	PROFILE("GBuffer drawing");
-	static LaunchParamsGBuffer launchParams = {};
+	static LaunchParameters <GBufferPass> launchParams = {};
 	launchParams.frameIndex					= getFrameIndex();
 	launchParams.frameSize					= getFrameSize();
 	launchParams.cameraData					= mScene->getCamera()->getCameraData();

src/render/passes/gbuffer/gbuffer.h

@@ -20,7 +20,7 @@ class GBufferPass : public RenderPass {
 
 private:
 	OptixBackend::SharedPtr mOptixBackend;
-	LaunchParamsGBuffer mLaunchParams;
+	LaunchParameters <GBufferPass> mLaunchParams;
 
 	bool mEnableDepth{};
 	bool mEnableDiffuse{};

src/render/path/device.cu

@@ -10,7 +10,7 @@ KRR_NAMESPACE_BEGIN
 using namespace shader;
 using namespace rt;
 
-extern "C" __constant__ LaunchParamsPT launchParams;
+extern "C" __constant__ LaunchParameters<MegakernelPathTracer> launchParams;
 
 template <typename... Args>
 KRR_DEVICE_FUNCTION void traceRay(OptixTraversableHandle traversable, Ray ray, float tMax,

src/render/path/path.h

@@ -24,26 +24,28 @@ const string shaderProgramNames[RAY_TYPE_COUNT] = {
 	"ShadowTransmittanceRay"
 };
 
-struct LaunchParamsPT {
-	uint frameID{ 0 };
+class MegakernelPathTracer;
+
+template <>
+struct LaunchParameters<MegakernelPathTracer> {
+	uint frameID{0};
 	Vector2i fbSize = Vector2i::Zero();
 	// per pixel debugging output
-	bool debugOutput	= false;
-	bool NEE			= false; // enable next event estimation (and MIS)
-	Vector2i debugPixel = {960, 540};
+	bool debugOutput	 = false;
+	bool NEE			 = false; // enable next event estimation (and MIS)
+	Vector2i debugPixel	 = {960, 540};
 	int maxDepth		 = 10;
 	float probRR		 = 0.8;
 	float clampThreshold = 1e4f; // clamp max radiance contrib per frame
 	int spp				 = 1;
 	int lightSamples	 = 1;
-	// scene 
+	// scene
 	Camera::CameraData camera;
 	LightSampler lightSampler;
 	rt::SceneData sceneData;
-
 	const RGBColorSpace *colorSpace;
 	CudaRenderTarget colorBuffer;
-	OptixTraversableHandle traversable{ 0 };
+	OptixTraversableHandle traversable{0};
 };
 
 struct PathData {

src/render/path/pathtracer.h

@@ -27,7 +27,7 @@ class MegakernelPathTracer: public RenderPass{
 
 private:
 	OptixBackend::SharedPtr optixBackend;
-	LaunchParamsPT launchParams;
+	LaunchParameters<MegakernelPathTracer> launchParams;
 
 	friend void to_json(json &j, const MegakernelPathTracer &p) {
 		j = json{

src/render/wavefront/device.cu

@@ -8,7 +8,7 @@
 using namespace krr;
 KRR_NAMESPACE_BEGIN
 
-extern "C" __constant__ LaunchParams launchParams;
+extern "C" __constant__ LaunchParameters <WavefrontPathTracer> launchParams;
 
 template <typename... Args>
 KRR_DEVICE_FUNCTION void traceRay(OptixTraversableHandle traversable, Ray ray,

src/render/wavefront/integrator.cpp

@@ -43,7 +43,7 @@ void WavefrontPathTracer::initialize() {
 void WavefrontPathTracer::traceClosest(int depth) {
 	PROFILE("Trace intersect rays");
 	// Telling whether volume rendering is enabled by mediumSampleQueue is null?
-	static LaunchParams params = {};
+	static LaunchParameters <WavefrontPathTracer> params = {};
 	params.traversable		   = backend->getRootTraversable();
 	params.sceneData		   = backend->getSceneData();
 	params.colorSpace		   = KRR_DEFAULT_COLORSPACE;
@@ -59,7 +59,7 @@ void WavefrontPathTracer::traceClosest(int depth) {
 
 void WavefrontPathTracer::traceShadow() {
 	PROFILE("Trace shadow rays");
-	static LaunchParams params = {};
+	static LaunchParameters <WavefrontPathTracer> params = {};
 	params.traversable		   = backend->getRootTraversable();
 	params.sceneData		   = backend->getSceneData();
 	params.colorSpace		   = KRR_DEFAULT_COLORSPACE;