Peter M. Groen / dali-demo

Commit 20bee75150dac9525a6d92cc3987e422e1f646e1

Authored by Kimmo Hoikka
Committed by Gerrit Code Review
2 parents d3b52de9 03b257d9

Merge "Changed Shadow example to use ImageView." into devel/master

Inline Side-by-side
Showing 1 changed file with 4 additions and 5 deletions
examples/shadow-bone-lighting/shadow-bone-lighting-example.cpp
  View file @20bee75
@@ -199,8 +199,7 @@ public: @@ -199,8 +199,7 @@ public:
199 mShadowView.SetPointLightFieldOfView( Math::PI / 2.0f); 199 mShadowView.SetPointLightFieldOfView( Math::PI / 2.0f);
200 mContents.Add(mShadowView); 200 mContents.Add(mShadowView);
201 201
202 - Image brickWall = ResourceImage::New(DALI_IMAGE_DIR "brick-wall.jpg");  
203 - mShadowPlaneBg = ImageActor::New(brickWall); 202 + mShadowPlaneBg = ImageView::New( DALI_IMAGE_DIR "brick-wall.jpg" );
204 mShadowPlaneBg.SetParentOrigin(ParentOrigin::CENTER); 203 mShadowPlaneBg.SetParentOrigin(ParentOrigin::CENTER);
205 mShadowPlaneBg.SetAnchorPoint(AnchorPoint::CENTER); 204 mShadowPlaneBg.SetAnchorPoint(AnchorPoint::CENTER);
206 mShadowPlaneBg.SetName("Plane"); 205 mShadowPlaneBg.SetName("Plane");
@@ -208,7 +207,7 @@ public: @@ -208,7 +207,7 @@ public:
208 mContents.Add(mShadowPlaneBg); 207 mContents.Add(mShadowPlaneBg);
209 mShadowPlaneBg.SetPosition(Vector3(50.0f, 50.0f, -200.0f)); 208 mShadowPlaneBg.SetPosition(Vector3(50.0f, 50.0f, -200.0f));
210 209
211 - mShadowView.SetShadowPlane(mShadowPlaneBg); 210 + mShadowView.SetShadowPlaneBackground(mShadowPlaneBg);
212 mShadowView.Activate(); 211 mShadowView.Activate();
213 212
214 mLightAnchor = Actor::New(); 213 mLightAnchor = Actor::New();
@@ -454,8 +453,8 @@ private: @@ -454,8 +453,8 @@ private:
454 Animation mSceneAnimation; 453 Animation mSceneAnimation;
455 bool mPaused; 454 bool mPaused;
456 Toolkit::ShadowView mShadowView; 455 Toolkit::ShadowView mShadowView;
457 - ImageActor mShadowPlaneBg;  
458 - ImageActor mShadowPlane; 456 + ImageView mShadowPlaneBg;
  457 + ImageView mShadowPlane;
459 Actor mCastingLight; 458 Actor mCastingLight;
460 Actor mLightAnchor; 459 Actor mLightAnchor;
461 ImageView mImageActor1; 460 ImageView mImageActor1;