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
Merge "text-decorator to use ImageView instead of ImageActors" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
plugins
/
dali-script-v8
/
src
/
shared
/
base-wrapped-object.h
diff --git
a/plugins/dali-script-v8/src/shared/base-wrapped-object.h
b/plugins/dali-script-v8/src/shared/base-wrapped-object.h
index
fee9d8c
..
db1c8a8
100644
(file)
--- a/
plugins/dali-script-v8/src/shared/base-wrapped-object.h
+++ b/
plugins/dali-script-v8/src/shared/base-wrapped-object.h
@@
-71,7
+71,8
@@
public:
CONNECTION,
ANIMATION,
PATH,
CONNECTION,
ANIMATION,
PATH,
- PATH_CONSTRAINT,
+ PATH_CONSTRAINER,
+ LINEAR_CONSTRAINER,
BUILDER,
STAGE,
FONT,
BUILDER,
STAGE,
FONT,
@@
-82,6
+83,12
@@
public:
RENDER_TASK,
RENDER_TASK_LIST,
TIMER,
RENDER_TASK,
RENDER_TASK_LIST,
TIMER,
+ SHADER,
+ SAMPLER,
+ MATERIAL,
+ GEOMETRY,
+ RENDERER,
+ PROPERTY_BUFFER,
TAP_GESTURE,
SHADER_EFFECT,
PAN_GESTURE,
TAP_GESTURE,
SHADER_EFFECT,
PAN_GESTURE,
@@
-135,7
+142,7
@@
public:
void SetJavascriptObject( v8::Isolate* isolate, v8::Local<v8::Object>& object );
/**
void SetJavascriptObject( v8::Isolate* isolate, v8::Local<v8::Object>& object );
/**
- * @return true if the object is of a certain wrapped type (e.g.
ImageActor
)
+ * @return true if the object is of a certain wrapped type (e.g.
Animation
)
*/
static bool IsWrappedType( v8::Isolate* isolate, const v8::Local<v8::Object>& object, BaseWrappedObject::Type type);
*/
static bool IsWrappedType( v8::Isolate* isolate, const v8::Local<v8::Object>& object, BaseWrappedObject::Type type);