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
Changes following "Remove Geometry scene object"
[platform/core/uifw/dali-toolkit.git]
/
node-addon
/
examples
/
line-mesh.js
diff --git
a/node-addon/examples/line-mesh.js
b/node-addon/examples/line-mesh.js
index
faaedb9
..
0385dae
100644
(file)
--- a/
node-addon/examples/line-mesh.js
+++ b/
node-addon/examples/line-mesh.js
@@
-58,8
+58,6
@@
daliApp.createMeshActor = function() {
var shader = new dali.Shader(shaderOptions);
var shader = new dali.Shader(shaderOptions);
- var material = new dali.Material( shader );
-
// Create vertex buffer
var pentagonVertexFormat ={ "aPosition1" : dali.PROPERTY_VECTOR2 };
// Create vertex buffer
var pentagonVertexFormat ={ "aPosition1" : dali.PROPERTY_VECTOR2 };
@@
-71,8
+69,8
@@
daliApp.createMeshActor = function() {
var pentagonVertexDataArray = new Float32Array(pentagonVertexData.length);
pentagonVertexDataArray.set(pentagonVertexData, 0);
var pentagonVertexDataArray = new Float32Array(pentagonVertexData.length);
pentagonVertexDataArray.set(pentagonVertexData, 0);
- var pentagonVertices = new dali.PropertyBuffer(pentagonVertexFormat
, 5
);
- pentagonVertices.setData(pentagonVertexDataArray);
+ var pentagonVertices = new dali.PropertyBuffer(pentagonVertexFormat);
+ pentagonVertices.setData(pentagonVertexDataArray
, 5
);
var pentacleVertexFormat ={ "aPosition2" : dali.PROPERTY_VECTOR2};
var pentacleVertexFormat ={ "aPosition2" : dali.PROPERTY_VECTOR2};
@@
-84,8
+82,8
@@
daliApp.createMeshActor = function() {
var pentacleVertexDataArray = new Float32Array(pentacleVertexData.length);
pentacleVertexDataArray.set(pentacleVertexData, 0);
var pentacleVertexDataArray = new Float32Array(pentacleVertexData.length);
pentacleVertexDataArray.set(pentacleVertexData, 0);
- var pentacleVertices = new dali.PropertyBuffer(pentacleVertexFormat
, 5
);
- pentacleVertices.setData(pentacleVertexDataArray);
+ var pentacleVertices = new dali.PropertyBuffer(pentacleVertexFormat);
+ pentacleVertices.setData(pentacleVertexDataArray
, 5
);
var indexFormat ={ "indices" : dali.PROPERTY_INTEGER };
var indexFormat ={ "indices" : dali.PROPERTY_INTEGER };
@@
-93,17
+91,15
@@
daliApp.createMeshActor = function() {
var indexDataArray = new Uint32Array(indexData.length);
indexDataArray.set(indexData, 0);
var indexDataArray = new Uint32Array(indexData.length);
indexDataArray.set(indexData, 0);
- var indices = new dali.PropertyBuffer(indexFormat, 10);
- indices.setData(indexDataArray);
// Create geometry
var geometry = new dali.Geometry();
geometry.addVertexBuffer( pentagonVertices );
geometry.addVertexBuffer( pentacleVertices );
// Create geometry
var geometry = new dali.Geometry();
geometry.addVertexBuffer( pentagonVertices );
geometry.addVertexBuffer( pentacleVertices );
- geometry.setIndexBuffer( ind
ices
);
+ geometry.setIndexBuffer( ind
exDataArray, 10
);
geometry.setGeometryType( dali.GEOMETRY_LINES );
geometry.setGeometryType( dali.GEOMETRY_LINES );
- var renderer = new dali.Renderer(geometry,
material
);
+ var renderer = new dali.Renderer(geometry,
shader
);
renderer.depthIndex = 0;
// Create mesh actor
renderer.depthIndex = 0;
// Create mesh actor
@@
-120,7
+116,7
@@
daliApp.createMeshActor = function() {
var animation = new dali.Animation(5);
var keyFramesIndex = [{progress:0.0, value: 0.0}, {progress:1.0, value:1.0}];
var animation = new dali.Animation(5);
var keyFramesIndex = [{progress:0.0, value: 0.0}, {progress:1.0, value:1.0}];
- var animOptions = { alpha:
"sin"
, delay:0, duration:5};
+ var animOptions = { alpha:
dali.ALPHA_FUNCTION_SIN
, delay:0, duration:5};
animation.animateBetween( meshActor, "uMorphAmount", keyFramesIndex, animOptions );
animation.setLooping(true);
animation.animateBetween( meshActor, "uMorphAmount", keyFramesIndex, animOptions );
animation.setLooping(true);