material emissive color separated from base color; voxel gi fix; gamma fixes; slightly reordered gbuffer;

2019-03-02 16:23:54 +00:00
parent aa8fa272d1
commit 30a4f4910b
37 changed files with 218 additions and 111 deletions
@@ -303,7 +303,7 @@ ObjectWindow::ObjectWindow(EditorComponent* editor) : editor(editor)
 		if (object != nullptr)
 		{
 			XMFLOAT3 col = args.color.toFloat3();
-			object->color = XMFLOAT4(powf(col.x, 1.f / 2.2f), powf(col.y, 1.f / 2.2f), powf(col.z, 1.f / 2.2f), object->color.w);
+			object->color = XMFLOAT4(col.x, col.y, col.z, object->color.w);
 		}
 	});
 	objectWindow->AddWidget(colorPicker);