graphics/paysages3d
1
0
Fork 0
Code Releases Activity

More realistic material previews (more light power with HDR applied)

Browse source
This commit is contained in:
Michaël Lemaire 2013-08-17 15:10:17 +02:00
parent 24a9145bb3
commit 45646d47a2
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/editing/previewmaterial.cpp
View file

@ -11,7 +11,9 @@
SmallMaterialPreview::SmallMaterialPreview(QWidget* parent, SurfaceMaterial* material) : QWidget(parent) SmallMaterialPreview::SmallMaterialPreview(QWidget* parent, SurfaceMaterial* material) : QWidget(parent)
{ {
_light.color = COLOR_WHITE; _light.color.r = 3.0;
_light.color.g = 3.0;
_light.color.b = 3.0;
_light.direction.x = -0.5; _light.direction.x = -0.5;
_light.direction.y = -0.5; _light.direction.y = -0.5;
_light.direction.z = -0.5; _light.direction.z = -0.5;
@ -24,11 +26,15 @@ SmallMaterialPreview::SmallMaterialPreview(QWidget* parent, SurfaceMaterial* mat
_renderer = rendererCreate(); _renderer = rendererCreate();
Vector3 camera_location = {0.0, 0.0, 10.0}; Vector3 camera_location = {0.0, 0.0, 10.0};
cameraSetLocation(_renderer->render_camera, camera_location); cameraSetLocation(_renderer->render_camera, camera_location);
_color_profile = colorProfileCreate();
colorProfileSetToneMapping(_color_profile, TONE_MAPPING_UNCHARTED, 1.0);
} }
SmallMaterialPreview::~SmallMaterialPreview() SmallMaterialPreview::~SmallMaterialPreview()
{ {
rendererDelete(_renderer); rendererDelete(_renderer);
colorProfileDelete(_color_profile);
} }
Color SmallMaterialPreview::getColor(double x, double y) Color SmallMaterialPreview::getColor(double x, double y)
@ -60,7 +66,7 @@ Color SmallMaterialPreview::getColor(double x, double y)
{ {
color.a = (1.0 - dist) / 0.05; color.a = (1.0 - dist) / 0.05;
} }
return color; return colorProfileApply(_color_profile, color);
} }
} }

1
src/editing/previewmaterial.h
View file

@ -21,6 +21,7 @@ private:
SurfaceMaterial* _material; SurfaceMaterial* _material;
LightDefinition _light; LightDefinition _light;
Renderer* _renderer; Renderer* _renderer;
ColorProfile* _color_profile;
}; };
class PreviewMaterial:public BasePreview class PreviewMaterial:public BasePreview