From: David Steele Date: Thu, 30 Apr 2015 18:22:25 +0000 (+0100) Subject: Minor Fixes to demos X-Git-Tag: dali_1.0.47~2^2~15 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F42%2F38942%2F3;p=platform%2Fcore%2Fuifw%2Fdali-demo.git Minor Fixes to demos Change-Id: I089eedc9dc7ca3a14fe3a1b43d7a4e75ebc653ad --- diff --git a/examples/point-mesh/point-mesh-example.cpp b/examples/point-mesh/point-mesh-example.cpp index 4524784..bf6c077 100644 --- a/examples/point-mesh/point-mesh-example.cpp +++ b/examples/point-mesh/point-mesh-example.cpp @@ -37,6 +37,7 @@ attribute highp float aHue; varying mediump vec2 vTexCoord; uniform mediump mat4 uMvpMatrix; uniform mediump vec3 uSize; +uniform mediump float uPointSize; uniform lowp vec4 uFadeColor; varying mediump vec3 vVertexColor; varying mediump float vHue; @@ -51,11 +52,11 @@ vec3 hsv2rgb(vec3 c) void main() { mediump vec4 vertexPosition = vec4(aPosition, 0.0, 1.0); - vertexPosition.xyz *= uSize; + vertexPosition.xyz *= (uSize-uPointSize); vertexPosition = uMvpMatrix * vertexPosition; - vVertexColor = hsv2rgb( vec3( aHue, 0.6, 0.7 ) ); + vVertexColor = hsv2rgb( vec3( aHue, 0.7, 1.0 ) ); vHue = aHue; - gl_PointSize = 80.0; + gl_PointSize = uPointSize; gl_Position = vertexPosition; } ); @@ -85,10 +86,11 @@ Geometry CreateGeometry() Vertex polyhedraVertexData[numSides]; float angle=0; float sectorAngle = 2.0f * Math::PI / (float) numSides; + for(unsigned int i=0; i