projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change the precision of size and uSize from mediumP to highP
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
visuals
/
wireframe
/
wireframe-visual.cpp
diff --git
a/dali-toolkit/internal/visuals/wireframe/wireframe-visual.cpp
b/dali-toolkit/internal/visuals/wireframe/wireframe-visual.cpp
index
3319e92
..
3707465
100644
(file)
--- a/
dali-toolkit/internal/visuals/wireframe/wireframe-visual.cpp
+++ b/
dali-toolkit/internal/visuals/wireframe/wireframe-visual.cpp
@@
-42,13
+42,13
@@
const char * const INDEX_NAME("indices");
const char* VERTEX_SHADER = DALI_COMPOSE_SHADER(
attribute mediump vec2 aPosition;\n
const char* VERTEX_SHADER = DALI_COMPOSE_SHADER(
attribute mediump vec2 aPosition;\n
-uniform
mediump
mat4 uMvpMatrix;\n
-uniform
mediump
vec3 uSize;\n
+uniform
highp
mat4 uMvpMatrix;\n
+uniform
highp
vec3 uSize;\n
\n
//Visual size and offset
uniform mediump vec2 offset;\n
\n
//Visual size and offset
uniform mediump vec2 offset;\n
-uniform
mediump
vec2 size;\n
+uniform
highp
vec2 size;\n
uniform mediump vec4 offsetSizeMode;\n
uniform mediump vec2 origin;\n
uniform mediump vec2 anchorPoint;\n
uniform mediump vec4 offsetSizeMode;\n
uniform mediump vec2 origin;\n
uniform mediump vec2 anchorPoint;\n
@@
-69,11
+69,10
@@
void main()\n
const char* FRAGMENT_SHADER = DALI_COMPOSE_SHADER(\n
uniform lowp vec4 uColor;\n
uniform lowp vec3 mixColor;\n
const char* FRAGMENT_SHADER = DALI_COMPOSE_SHADER(\n
uniform lowp vec4 uColor;\n
uniform lowp vec3 mixColor;\n
- uniform lowp float opacity;\n
\n
void main()\n
{\n
\n
void main()\n
{\n
- gl_FragColor = uColor * vec4( mixColor,
opacity
);\n
+ gl_FragColor = uColor * vec4( mixColor,
1.0
);\n
}\n
);
}\n
);
@@
-107,7
+106,7
@@
WireframeVisualPtr WireframeVisual::New( VisualFactoryCache& factoryCache, Visua
}
WireframeVisual::WireframeVisual( VisualFactoryCache& factoryCache, Visual::BasePtr actualVisual )
}
WireframeVisual::WireframeVisual( VisualFactoryCache& factoryCache, Visual::BasePtr actualVisual )
-: Visual::Base( factoryCache, Visual::FittingMode::FILL ),
+: Visual::Base( factoryCache, Visual::FittingMode::FILL
, actualVisual ? actualVisual->GetType() : Toolkit::Visual::WIREFRAME
),
mActualVisual( actualVisual )
{
}
mActualVisual( actualVisual )
{
}
@@
-169,7
+168,7
@@
void WireframeVisual::DoSetProperties( const Property::Map& propertyMap )
}
}
}
}
-void WireframeVisual::DoSetOnS
tag
e( Actor& actor )
+void WireframeVisual::DoSetOnS
cen
e( Actor& actor )
{
InitializeRenderer();
{
InitializeRenderer();
@@
-217,7
+216,7
@@
Geometry WireframeVisual::CreateQuadWireframeGeometry()
Property::Map quadVertexFormat;
quadVertexFormat[POSITION_ATTRIBUTE_NAME] = Property::VECTOR2;
Property::Map quadVertexFormat;
quadVertexFormat[POSITION_ATTRIBUTE_NAME] = Property::VECTOR2;
-
PropertyBuffer quadVertices = Property
Buffer::New( quadVertexFormat );
+
VertexBuffer quadVertices = Vertex
Buffer::New( quadVertexFormat );
quadVertices.SetData( quadVertexData, 4 );
// Create indices
quadVertices.SetData( quadVertexData, 4 );
// Create indices
@@
-241,6
+240,16
@@
void WireframeVisual::OnSetTransform()
}
}
}
}
+Visual::Base& WireframeVisual::GetVisualObject()
+{
+ if( mActualVisual )
+ {
+ return *mActualVisual.Get();
+ }
+
+ return *this;
+}
+
} // namespace Internal
} // namespace Toolkit
} // namespace Internal
} // namespace Toolkit