X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fscene3d-view%2Fgltf-loader.cpp;h=1132e9510afd8f95be7e5d614c73c62afa5f08d0;hp=0f69edc34ae96b4f70ccf7c92bf99567fd455fd3;hb=73eaac8af8efb9ac721db3fcf3c71a7a3115282a;hpb=1e84d2219befeac1fb9735b3978f73f72005b3d4

diff --git a/dali-toolkit/internal/controls/scene3d-view/gltf-loader.cpp b/dali-toolkit/internal/controls/scene3d-view/gltf-loader.cpp
index 0f69edc..1132e95 100644
--- a/dali-toolkit/internal/controls/scene3d-view/gltf-loader.cpp
+++ b/dali-toolkit/internal/controls/scene3d-view/gltf-loader.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -236,7 +236,7 @@ void FitBuffer( Dali::Vector<Vector4>& bufferDestination, Dali::Vector<T>& buffe
 template <typename T>
 bool ReadBinFile( Vector<T> &dataBuffer, std::string url, int32_t offset, int32_t count )
 {
-  Dali::FileStream fileStream( url, FileStream::READ || FileStream::BINARY );
+  Dali::FileStream fileStream( url, FileStream::READ | FileStream::BINARY );
   FILE* fp = fileStream.GetFile();
   if( !fp )
   {
@@ -1291,8 +1291,8 @@ void Loader::LoadCamera( Scene3dView& scene3dView )
     }
 
     CameraActor cameraActor = CameraActor::New();
-    cameraActor.SetParentOrigin( ParentOrigin::CENTER );
-    cameraActor.SetAnchorPoint( AnchorPoint::CENTER );
+    cameraActor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
+    cameraActor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER );
 
     if( cameraInfo.type == "orthographic" )
     {
@@ -1428,7 +1428,7 @@ bool Loader::LoadSceneNodes( Scene3dView& scene3dView )
   for( auto nodeIter = tempNode->CBegin(), end = tempNode->CEnd(); nodeIter != end; ++nodeIter )
   {
     Actor actor = AddNode( scene3dView, ( ( *nodeIter ).second ).GetInteger() );
-    actor.SetParentOrigin( ParentOrigin::CENTER );
+    actor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
     scene3dView.GetRoot().Add( actor );
   }
 
@@ -1581,14 +1581,14 @@ Actor Loader::AddNode( Scene3dView& scene3dView, uint32_t index )
     renderer.SetTextures( textureSet );
 
     anchorPoint = meshInfo.pivot;
-    actor.SetAnchorPoint( anchorPoint );
+    actor.SetProperty( Actor::Property::ANCHOR_POINT, anchorPoint );
 
-    actor.SetSize( Vector3( meshInfo.size.x, meshInfo.size.y, meshInfo.size.z ) );
+    actor.SetProperty( Actor::Property::SIZE, Vector3( meshInfo.size.x, meshInfo.size.y, meshInfo.size.z ) );
     actor.AddRenderer( renderer );
 
-    actor.SetScale( scale );
+    actor.SetProperty( Actor::Property::SCALE, scale );
     actor.RotateBy( orientation );
-    actor.SetPosition( translation );
+    actor.SetProperty( Actor::Property::POSITION, translation );
 
     shader.RegisterProperty( "uLightType", ( scene3dView.GetLightType() & ~Toolkit::Scene3dView::LightType::IMAGE_BASED_LIGHT ) );
     shader.RegisterProperty( "uLightVector", scene3dView.GetLightVector() );
@@ -1648,10 +1648,10 @@ Actor Loader::AddNode( Scene3dView& scene3dView, uint32_t index )
   }
   else
   {
-    actor.SetAnchorPoint( AnchorPoint::CENTER );
-    actor.SetPosition( translation );
+    actor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER );
+    actor.SetProperty( Actor::Property::POSITION, translation );
     actor.RotateBy( orientation );
-    actor.SetSize( actorSize );
+    actor.SetProperty( Actor::Property::SIZE, actorSize );
   }
 
   tempNode = node->GetChild( "camera" );
@@ -1670,7 +1670,7 @@ Actor Loader::AddNode( Scene3dView& scene3dView, uint32_t index )
   {
     std::string nameString;
     ReadString( tempNode, nameString );
-    actor.SetName( nameString );
+    actor.SetProperty( Dali::Actor::Property::NAME, nameString );
   }
 
   SetActorCache( actor, index );
@@ -1679,7 +1679,7 @@ Actor Loader::AddNode( Scene3dView& scene3dView, uint32_t index )
     for( auto childIter = tempNode->CBegin(), end = tempNode->CEnd(); childIter != end; ++childIter )
     {
       Actor childActor = AddNode( scene3dView, ( ( *childIter ).second ).GetInteger() );
-      childActor.SetParentOrigin( anchorPoint );
+      childActor.SetProperty( Actor::Property::PARENT_ORIGIN, anchorPoint );
       actor.Add( childActor );
     }
   }
@@ -1776,10 +1776,10 @@ bool Loader::LoadAnimation( Scene3dView& scene3dView )
       }
 
       Animation animation = Animation::New( duration );
-      Animation::Interpolation interpolation = Animation::Interpolation::Linear;
+      Animation::Interpolation interpolation = Animation::Interpolation::LINEAR;
       if( animationInfo.samplerArray[currentChannel.sampler].interpolation == "CUBICSPLINE" )
       {
-        interpolation = Animation::Interpolation::Cubic;
+        interpolation = Animation::Interpolation::CUBIC;
       }
       if( animationInfo.samplerArray[currentChannel.sampler].interpolation == "STEP" )
       {