diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-11-15 15:46:31 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-11-15 15:47:25 +0200 |
| commit | 3bf5bc2e19167dfa0eb72ceaf98ae621f998f549 (patch) | |
| tree | b15b986dff5d2d516a4dd4eddd6f12bcb83a8e55 /chart2 | |
| parent | 1c154c84d25866cf8c5ab1a55973548e52268504 (diff) | |
Revert some chart2 shader-affecting changes
from
commit 8d4a306eb04742f499ab693e7f8ebd3ae3c01415
Author: Noel Grandin <noel.grandin@collabora.co.uk>
Date: Tue Nov 15 11:26:59 2016 +0200
loplugin:unusedfields
and
commit c79b7fd8d4e6e029cf8e6bfb2c7e10b52a4d5781
Author: Noel Grandin <noel@peralex.com>
Date: 2015-11-20 10:41:00 (GMT)
loplugin:unusedfields in chart2
Change-Id: I6b61aa9c6abb1d51e96d5eb6c623d86fd6fd5b82
Diffstat (limited to 'chart2')
| -rw-r--r-- | chart2/source/view/inc/GL3DRenderer.hxx | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/chart2/source/view/inc/GL3DRenderer.hxx b/chart2/source/view/inc/GL3DRenderer.hxx index ca99ec2ea2f2..240fb955bb17 100644 --- a/chart2/source/view/inc/GL3DRenderer.hxx +++ b/chart2/source/view/inc/GL3DRenderer.hxx @@ -41,6 +41,7 @@ struct PosVecf3 typedef std::vector <glm::vec3> Vertices3D; typedef std::vector <glm::vec3> Normals3D; +// fields must match definition in GLSL shader file struct MaterialParameters { glm::vec4 ambient; @@ -48,15 +49,21 @@ struct MaterialParameters glm::vec4 specular; glm::vec4 materialColor; - bool twoSidesLighting; + bool twoSidesLighting; float shininess; + float pad; + float pad1; }; +// fields must match definition in GLSL shader file struct LightSource { glm::vec4 lightColor; glm::vec4 positionWorldspace; float lightPower; + float pad1; + float pad2; + float pad3; }; struct GlobalLights |