X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fmodel3d-view%2Fmodel3d-view-impl.cpp;h=2c27f85799a00189d37a4556b3a4949550270eed;hp=b8dfc753eac85e47c0eebd4aa700ee25c5e1143d;hb=a073ebfd862b49692c8e6d7dff2b128e62a4f6df;hpb=fddb0059f61f9e5dfd10521a14e15e6bad110d06

diff --git a/dali-toolkit/internal/controls/model3d-view/model3d-view-impl.cpp b/dali-toolkit/internal/controls/model3d-view/model3d-view-impl.cpp
index b8dfc75..2c27f85 100644
--- a/dali-toolkit/internal/controls/model3d-view/model3d-view-impl.cpp
+++ b/dali-toolkit/internal/controls/model3d-view/model3d-view-impl.cpp
@@ -52,15 +52,15 @@ BaseHandle Create()
 // Setup properties, signals and actions using the type-registry.
 DALI_TYPE_REGISTRATION_BEGIN( Toolkit::Model3dView, Toolkit::Control, Create );
 
-DALI_PROPERTY_REGISTRATION( Toolkit, Model3dView, "geometry-url", STRING, GEOMETRY_URL)
-DALI_PROPERTY_REGISTRATION( Toolkit, Model3dView, "material-url", STRING, MATERIAL_URL)
-DALI_PROPERTY_REGISTRATION( Toolkit, Model3dView, "images-url", STRING, IMAGES_URL)
-DALI_PROPERTY_REGISTRATION( Toolkit, Model3dView, "illumination-type", INTEGER, ILLUMINATION_TYPE)
-DALI_PROPERTY_REGISTRATION( Toolkit, Model3dView, "texture0-url", STRING, TEXTURE0_URL)
-DALI_PROPERTY_REGISTRATION( Toolkit, Model3dView, "texture1-url", STRING, TEXTURE1_URL)
-DALI_PROPERTY_REGISTRATION( Toolkit, Model3dView, "texture2-url", STRING, TEXTURE2_URL)
+DALI_PROPERTY_REGISTRATION( Toolkit, Model3dView, "geometryUrl",  STRING, GEOMETRY_URL)
+DALI_PROPERTY_REGISTRATION( Toolkit, Model3dView, "materialUrl",  STRING, MATERIAL_URL)
+DALI_PROPERTY_REGISTRATION( Toolkit, Model3dView, "imagesUrl",  STRING, IMAGES_URL)
+DALI_PROPERTY_REGISTRATION( Toolkit, Model3dView, "illuminationType",  INTEGER, ILLUMINATION_TYPE)
+DALI_PROPERTY_REGISTRATION( Toolkit, Model3dView, "texture0Url",  STRING, TEXTURE0_URL)
+DALI_PROPERTY_REGISTRATION( Toolkit, Model3dView, "texture1Url",  STRING, TEXTURE1_URL)
+DALI_PROPERTY_REGISTRATION( Toolkit, Model3dView, "texture2Url",  STRING, TEXTURE2_URL)
 
-DALI_ANIMATABLE_PROPERTY_REGISTRATION( Toolkit, Model3dView, "light-position", VECTOR3, LIGHT_POSITION)
+DALI_ANIMATABLE_PROPERTY_REGISTRATION( Toolkit, Model3dView, "lightPosition",  VECTOR3, LIGHT_POSITION)
 
 DALI_TYPE_REGISTRATION_END()
 
@@ -447,6 +447,8 @@ Property::Value Model3dView::GetProperty( BaseObject* object, Property::Index in
 
 void Model3dView::OnStageConnection( int depth )
 {
+  Control::OnStageConnection( depth );
+
   CustomActor self = Self();
   self.AddRenderer( mRenderer );
 
@@ -566,7 +568,7 @@ void Model3dView::UpdateShaderUniforms()
     UpdateView();
 
     Vector3 lightPosition( 0, 0, 0 );
-    Dali::Property::Index lightProperty = mShader.RegisterProperty( "lightPosition", lightPosition );
+    Dali::Property::Index lightProperty = mShader.RegisterProperty( "uLightPosition", lightPosition );
 
     CustomActor self = Self();
 
@@ -627,11 +629,7 @@ void Model3dView::LoadTextures()
     Image tex0 = ResourceImage::New( imgUrl );
     if( tex0 )
     {
-      Sampler sampler = Sampler::New( tex0, "sDiffuse" );
-      sampler.SetWrapMode(Sampler::REPEAT,Sampler::REPEAT);
-      sampler.SetAffectsTransparency(false);
-
-      mMaterial.AddSampler( sampler );
+      mMaterial.AddTexture( tex0, "sDiffuse" );
     }
   }
 
@@ -643,12 +641,7 @@ void Model3dView::LoadTextures()
     Image tex1 = ResourceImage::New( imgUrl );
     if (tex1)
     {
-      Sampler sampler = Sampler::New( tex1, "sNormal" );
-      sampler.SetWrapMode(Sampler::REPEAT,Sampler::REPEAT);
-      sampler.SetAffectsTransparency(false);
-      sampler.SetFilterMode(Sampler::LINEAR,Sampler::LINEAR);
-
-      mMaterial.AddSampler( sampler );
+      mMaterial.AddTexture( tex1, "sNormal" );
     }
   }
 
@@ -660,12 +653,7 @@ void Model3dView::LoadTextures()
     Image tex2 = ResourceImage::New( imgUrl );
     if( tex2 )
     {
-      Sampler sampler = Sampler::New( tex2, "sGloss" );
-      sampler.SetWrapMode(Sampler::REPEAT,Sampler::REPEAT);
-      sampler.SetAffectsTransparency(false);
-      sampler.SetFilterMode(Sampler::LINEAR,Sampler::LINEAR);
-
-      mMaterial.AddSampler( sampler );
+      mMaterial.AddTexture( tex2, "sGloss" );
     }
   }
 }