Peter M. Groen / dali-demo

Commit de02cf1d81d8a6fc40b2d7b55174a1651c658759

Authored by Tom Robinson
1 parent 2ab1c750

Moved Core Rendering API from devel-api to public-api 

Change-Id: I2f8676282ff622eba6f3fd67dd6db11c52d3c260
Inline Side-by-side
Showing 15 changed files with 30 additions and 30 deletions
examples/benchmark/benchmark.cpp
  View file @de02cf1
... ... @@ -16,7 +16,7 @@
16 16 */
17 17  
18 18 // EXTERNAL INCLUDES
19   -#include <dali/devel-api/rendering/renderer.h>
  19 +#include <dali/public-api/rendering/renderer.h>
20 20 #include <dali-toolkit/dali-toolkit.h>
21 21  
22 22 // INTERNAL INCLUDES
... ...
examples/compressed-texture-formats/compressed-texture-formats-example.cpp
  View file @de02cf1
... ... @@ -17,7 +17,7 @@
17 17  
18 18 // EXTERNAL INCLUDES
19 19 #include <dali/dali.h>
20   -#include <dali/devel-api/rendering/renderer.h>
  20 +#include <dali/public-api/rendering/renderer.h>
21 21 #include <dali-toolkit/dali-toolkit.h>
22 22  
23 23 // INTERNAL INCLUDES
... ...
examples/line-mesh/line-mesh-example.cpp
  View file @de02cf1
1 1 /*
2   - * Copyright (c) 2015 Samsung Electronics Co., Ltd.
  2 + * Copyright (c) 2016 Samsung Electronics Co., Ltd.
3 3 *
4 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 5 * you may not use this file except in compliance with the License.
... ... @@ -16,7 +16,7 @@
16 16 */
17 17  
18 18 // EXTERNAL INCLUDES
19   -#include <dali/devel-api/rendering/renderer.h>
  19 +#include <dali/public-api/rendering/renderer.h>
20 20 #include <dali-toolkit/dali-toolkit.h>
21 21  
22 22 // INTERNAL INCLUDES
... ...
examples/mesh-morph/mesh-morph-example.cpp
  View file @de02cf1
1 1 /*
2   - * Copyright (c) 2014 Samsung Electronics Co., Ltd.
  2 + * Copyright (c) 2016 Samsung Electronics Co., Ltd.
3 3 *
4 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 5 * you may not use this file except in compliance with the License.
... ... @@ -16,7 +16,7 @@
16 16 */
17 17  
18 18 // EXTERNAL INCLUDES
19   -#include <dali/devel-api/rendering/renderer.h>
  19 +#include <dali/public-api/rendering/renderer.h>
20 20 #include <dali-toolkit/dali-toolkit.h>
21 21  
22 22 // INTERNAL INCLUDES
... ...
examples/mesh-sorting/mesh-sorting-example.cpp
  View file @de02cf1
1 1 /*
2   - * Copyright (c) 2015 Samsung Electronics Co., Ltd.
  2 + * Copyright (c) 2016 Samsung Electronics Co., Ltd.
3 3 *
4 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 5 * you may not use this file except in compliance with the License.
... ... @@ -16,7 +16,7 @@
16 16 */
17 17  
18 18 // EXTERNAL INCLUDES
19   -#include <dali/devel-api/rendering/renderer.h>
  19 +#include <dali/public-api/rendering/renderer.h>
20 20 #include <dali-toolkit/dali-toolkit.h>
21 21 #include <stdio.h>
22 22 #include <sstream>
... ...
examples/metaball-explosion/metaball-explosion-example.cpp
  View file @de02cf1
... ... @@ -15,14 +15,14 @@
15 15 *
16 16 */
17 17  
18   -//External includes
  18 +// EXTERNAL INCLUDES
19 19 #include <cstdio>
20 20 #include <string>
21 21  
22   -//Internal includes
  22 +// INTERNAL INCLUDES
23 23 #include <dali/dali.h>
24 24 #include <dali/devel-api/images/texture-set-image.h>
25   -#include <dali/devel-api/rendering/renderer.h>
  25 +#include <dali/public-api/rendering/renderer.h>
26 26 #include <dali-toolkit/dali-toolkit.h>
27 27  
28 28 #include "shared/view.h"
... ...
examples/metaball-refrac/metaball-refrac-example.cpp
  View file @de02cf1
... ... @@ -17,7 +17,7 @@
17 17  
18 18 #include <dali/dali.h>
19 19 #include <dali/devel-api/images/texture-set-image.h>
20   -#include <dali/devel-api/rendering/renderer.h>
  20 +#include <dali/public-api/rendering/renderer.h>
21 21 #include <dali-toolkit/dali-toolkit.h>
22 22  
23 23 #include <cstdio>
... ...
examples/native-image-source/native-image-source-example.cpp
  View file @de02cf1
... ... @@ -18,8 +18,8 @@
18 18 // EXTERNAL INCLUDES
19 19 #include <dali/dali.h>
20 20 #include <dali/devel-api/images/native-image-interface-extension.h>
21   -#include <dali/devel-api/rendering/renderer.h>
22   -#include <dali/devel-api/rendering/frame-buffer.h>
  21 +#include <dali/public-api/rendering/renderer.h>
  22 +#include <dali/public-api/rendering/frame-buffer.h>
23 23 #include <dali-toolkit/dali-toolkit.h>
24 24 #include <cstring>
25 25  
... ...
examples/new-window/new-window-example.cpp
  View file @de02cf1
... ... @@ -16,7 +16,7 @@
16 16  
17 17 // EXTERNAL INCLUDES
18 18 #include <dali/devel-api/images/texture-set-image.h>
19   -#include <dali/devel-api/rendering/renderer.h>
  19 +#include <dali/public-api/rendering/renderer.h>
20 20 #include <dali-toolkit/dali-toolkit.h>
21 21 #include <dali-toolkit/devel-api/controls/bubble-effect/bubble-emitter.h>
22 22  
... ...
examples/perf-scroll/perf-scroll.cpp
  View file @de02cf1
... ... @@ -15,7 +15,7 @@
15 15 *
16 16 */
17 17  
18   -#include <dali/devel-api/rendering/renderer.h>
  18 +#include <dali/public-api/rendering/renderer.h>
19 19 #include <dali-toolkit/dali-toolkit.h>
20 20  
21 21 #include "shared/utility.h"
... ...
examples/point-mesh/point-mesh-example.cpp
  View file @de02cf1
1 1 /*
2   - * Copyright (c) 2015 Samsung Electronics Co., Ltd.
  2 + * Copyright (c) 2016 Samsung Electronics Co., Ltd.
3 3 *
4 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 5 * you may not use this file except in compliance with the License.
... ... @@ -16,7 +16,7 @@
16 16 */
17 17  
18 18 // EXTERNAL INCLUDES
19   -#include <dali/devel-api/rendering/renderer.h>
  19 +#include <dali/public-api/rendering/renderer.h>
20 20 #include <dali-toolkit/dali-toolkit.h>
21 21  
22 22 // INTERNAL INCLUDES
... ...
examples/radial-menu/radial-sweep-view-impl.cpp
  View file @de02cf1
1 1 /*
2   - * Copyright (c) 2015 Samsung Electronics Co., Ltd.
  2 + * Copyright (c) 2016 Samsung Electronics Co., Ltd.
3 3 *
4 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 5 * you may not use this file except in compliance with the License.
... ... @@ -17,7 +17,7 @@
17 17  
18 18 #include "radial-sweep-view-impl.h"
19 19  
20   -#include <dali/devel-api/rendering/renderer.h>
  20 +#include <dali/public-api/rendering/renderer.h>
21 21 #include <sstream>
22 22  
23 23 using namespace Dali;
... ...
examples/refraction-effect/refraction-effect-example.cpp
  View file @de02cf1
1 1 /*
2   - * Copyright (c) 2015 Samsung Electronics Co., Ltd.
  2 + * Copyright (c) 2016 Samsung Electronics Co., Ltd.
3 3 *
4 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 5 * you may not use this file except in compliance with the License.
... ... @@ -17,7 +17,7 @@
17 17  
18 18 // EXTERNAL INCLUDES
19 19 #include <dali/dali.h>
20   -#include <dali/devel-api/rendering/renderer.h>
  20 +#include <dali/public-api/rendering/renderer.h>
21 21 #include <dali-toolkit/dali-toolkit.h>
22 22  
23 23 #include <fstream>
... ...
examples/textured-mesh/textured-mesh-example.cpp
  View file @de02cf1
1 1 /*
2   - * Copyright (c) 2014 Samsung Electronics Co., Ltd.
  2 + * Copyright (c) 2016 Samsung Electronics Co., Ltd.
3 3 *
4 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 5 * you may not use this file except in compliance with the License.
... ... @@ -16,7 +16,7 @@
16 16 */
17 17  
18 18 // EXTERNAL INCLUDES
19   -#include <dali/devel-api/rendering/renderer.h>
  19 +#include <dali/public-api/rendering/renderer.h>
20 20 #include <dali-toolkit/dali-toolkit.h>
21 21  
22 22 // INTERNAL INCLUDES
... ...
shared/utility.h
  View file @de02cf1
1   -#ifndef __DALI_DEMO_UTILITY_H__
2   -#define __DALI_DEMO_UTILITY_H__
  1 +#ifndef DALI_DEMO_UTILITY_H
  2 +#define DALI_DEMO_UTILITY_H
3 3  
4 4 /*
5   - * Copyright (c) 2014 Samsung Electronics Co., Ltd.
  5 + * Copyright (c) 2016 Samsung Electronics Co., Ltd.
6 6 *
7 7 * Licensed under the Apache License, Version 2.0 (the "License");
8 8 * you may not use this file except in compliance with the License.
... ... @@ -20,9 +20,9 @@
20 20  
21 21 #include <dali/dali.h>
22 22 #include <dali/devel-api/images/atlas.h>
23   -#include <dali/devel-api/rendering/geometry.h>
24   -#include <dali/devel-api/rendering/texture.h>
25 23 #include <dali/devel-api/adaptor-framework/bitmap-loader.h>
  24 +#include <dali/public-api/rendering/geometry.h>
  25 +#include <dali/public-api/rendering/texture.h>
26 26  
27 27 namespace DemoHelper
28 28 {
... ... @@ -118,4 +118,4 @@ Dali::Geometry CreateTexturedQuad()
118 118 }
119 119 } // DemoHelper
120 120  
121   -#endif // __DALI_DEMO_HELPER_VIEW_H__
  121 +#endif // DALI_DEMO_UTILITY_H
... ...