Adding a simple manual exposure control to configure the tonemapping and expose it to js. Add a convenient way to access the Job._concept._data with template

samcake committed 10 years ago

Commit d2ebaef1 parent 2bbd5d818 files · +165 −12Browse files

Showing the changes to libraries/render-utils/src/DebugDeferredBuffer.cpp (1 of 18 files). Show all

Unified · Split

libraries/render-utils/src/DebugDeferredBuffer.cpp+2−2

@@ -49,7 +49,7 @@ static const std::string FUNCTIONS_PLACEHOLDER { "/FUNCTIONS_PLACEHOLDER/" }; · 48 unmodified lines
49	std::string DebugDeferredBuffer::getCode(Modes mode) {	49	std::string DebugDeferredBuffer::getCode(Modes mode) {
50	switch (mode) {	50	switch (mode) {
51	case DiffuseMode: {	51	case DiffuseMode: {
52	QString code = "return vec4(texture(%1, uv).xyz, 1.0);";	52	QString code = "return vec4(pow(texture(%1, uv).xyz, vec3(1.0 / 2.2)), 1.0);";
53	return code.arg(SLOT_NAMES[Diffuse].c_str()).toStdString();	53	return code.arg(SLOT_NAMES[Diffuse].c_str()).toStdString();
54	}	54	}
55	case AlphaMode: {	55	case AlphaMode: {
@@ -73,7 +73,7 @@ std::string DebugDeferredBuffer::getCode(Modes mode) { · 17 unmodified lines
73	return code.arg(SLOT_NAMES[Depth].c_str()).toStdString();	73	return code.arg(SLOT_NAMES[Depth].c_str()).toStdString();
74	}	74	}
75	case LightingMode: {	75	case LightingMode: {
76	QString code = "return vec4(texture(%1, uv).xyz, 1.0);";	76	QString code = "return vec4(pow(texture(%1, uv).xyz, vec3(1.0 / 2.2)), 1.0);";
77	return code.arg(SLOT_NAMES[Lighting].c_str()).toStdString();	77	return code.arg(SLOT_NAMES[Lighting].c_str()).toStdString();
78	}	78	}
79	case CustomMode:	79	case CustomMode: