projects
/
platform
/
core
/
uifw
/
dali-demo.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove ResourceImage usage from demos
[platform/core/uifw/dali-demo.git]
/
examples
/
textured-mesh
/
textured-mesh-example.cpp
diff --git
a/examples/textured-mesh/textured-mesh-example.cpp
b/examples/textured-mesh/textured-mesh-example.cpp
index
1de4316
..
6285ae3
100644
(file)
--- a/
examples/textured-mesh/textured-mesh-example.cpp
+++ b/
examples/textured-mesh/textured-mesh-example.cpp
@@
-21,6
+21,7
@@
// INTERNAL INCLUDES
#include "shared/view.h"
// INTERNAL INCLUDES
#include "shared/view.h"
+#include "shared/utility.h"
using namespace Dali;
using namespace Dali;
@@
-140,15
+141,15
@@
public:
// Hide the indicator bar
application.GetWindow().ShowIndicator( Dali::Window::INVISIBLE );
// Hide the indicator bar
application.GetWindow().ShowIndicator( Dali::Window::INVISIBLE );
-
mImage = ResourceImage::New
( MATERIAL_SAMPLE );
-
Image image = ResourceImage::New
( MATERIAL_SAMPLE2 );
+
Texture texture1 = DemoHelper::LoadTexture
( MATERIAL_SAMPLE );
+
Texture texture2 = DemoHelper::LoadTexture
( MATERIAL_SAMPLE2 );
mShader = Shader::New( VERTEX_SHADER, FRAGMENT_SHADER );
mTextureSet1 = TextureSet::New();
mShader = Shader::New( VERTEX_SHADER, FRAGMENT_SHADER );
mTextureSet1 = TextureSet::New();
- mTextureSet1.Set
Image( 0u, mImage
);
+ mTextureSet1.Set
Texture( 0u, texture1
);
mTextureSet2 = TextureSet::New();
mTextureSet2 = TextureSet::New();
- mTextureSet2.Set
Image( 0u, image
);
+ mTextureSet2.Set
Texture( 0u, texture2
);
mGeometry = CreateGeometry();
mGeometry = CreateGeometry();
@@
-258,7
+259,6
@@
private:
Application& mApplication; ///< Application instance
Vector3 mStageSize; ///< The size of the stage
Application& mApplication; ///< Application instance
Vector3 mStageSize; ///< The size of the stage
- Image mImage;
Shader mShader;
TextureSet mTextureSet1;
TextureSet mTextureSet2;
Shader mShader;
TextureSet mTextureSet1;
TextureSet mTextureSet2;