From 0bc8de3daeb9f469a9c92b107532502a778d0575 Mon Sep 17 00:00:00 2001
From: Yoonsang Lee <ysang114.lee@samsung.com>
Date: Mon, 20 Jul 2015 09:54:05 +0900
Subject: [PATCH] [DALi][DOC-213] Move animation.multi-threading into
 background.multi-threaded architecture

Signed-off-by: Yoonsang Lee <ysang114.lee@samsung.com>
Change-Id: I4d363c69efebee070a788dba6ae03e1a4eec4247
---
 org.tizen.ui.guides/html/index.htm                 |  4 +-
 .../html/native/dali/background_n.htm              |  2 +-
 .../html/native/dali/guides_dali_n.htm             |  3 +-
 ...{multi_threading_n.htm => multi_threaded_n.htm} | 39 ++++++++---
 org.tizen.ui.guides/html/native/dali/threads_n.htm | 78 ----------------------
 5 files changed, 32 insertions(+), 94 deletions(-)
 rename org.tizen.ui.guides/html/native/dali/{multi_threading_n.htm => multi_threaded_n.htm} (79%)
 delete mode 100755 org.tizen.ui.guides/html/native/dali/threads_n.htm

diff --git a/org.tizen.ui.guides/html/index.htm b/org.tizen.ui.guides/html/index.htm
index 3a7c148..63383af 100755
--- a/org.tizen.ui.guides/html/index.htm
+++ b/org.tizen.ui.guides/html/index.htm
@@ -218,7 +218,6 @@
 					<ul>
 						<li><a href="native/dali/animation_types_n.htm">Types of Animations</a></li>
 						<li><a href="native/dali/constraints_n.htm">Constraints</a></li>
-						<li><a href="native/dali/multi_threading_n.htm">Multi-threading</a></li>
 					</ul>
 				</li>
 				<li><a href="native/dali/resources_n.htm">Resources</a></li>
@@ -227,9 +226,8 @@
 					<ul>
 						<li><a href="native/dali/handle_n.htm">Handle/Body Pattern</a></li>
 						<li><a href="native/dali/properties_n.htm">Properties</a></li>
-						<li><a href="native/dali/threads_n.htm">Thread Architecture</a></li>
+						<li><a href="native/dali/multi_threaded_n.htm">Multi-Threaded Architecture</a></li>
 					</ul>
-
 			</ul>
 		</li>
 	</ul>
diff --git a/org.tizen.ui.guides/html/native/dali/background_n.htm b/org.tizen.ui.guides/html/native/dali/background_n.htm
index 0d9980c..7e16d5e 100755
--- a/org.tizen.ui.guides/html/native/dali/background_n.htm
+++ b/org.tizen.ui.guides/html/native/dali/background_n.htm
@@ -39,7 +39,7 @@
 	<ul>
 		<li><a href="handle_n.htm">Handle/Body Pattern: Basic Way of Using DALi Objects</a></li>
 		<li><a href="properties_n.htm">Properties: Accessing to Properties of DALi Objects</a></li>
-		<li><a href="threads_n.htm">Thread Architecture: High-Performance Multi-Threaded Architecture of DALi</a></li>
+		<li><a href="multi_threaded_n.htm">Multi-Threaded Architecture: The Secret of High-Performance of DALi</a></li>
 	</ul>
 
 
diff --git a/org.tizen.ui.guides/html/native/dali/guides_dali_n.htm b/org.tizen.ui.guides/html/native/dali/guides_dali_n.htm
index b3baf86..affe483 100755
--- a/org.tizen.ui.guides/html/native/dali/guides_dali_n.htm
+++ b/org.tizen.ui.guides/html/native/dali/guides_dali_n.htm
@@ -62,7 +62,6 @@
 	<ul>
 		<li><a href="animation_types_n.htm">Types of Animations: Various Animations Supported by DALi</a></li>
 		<li><a href="constraints_n.htm">Constraints: Imposing Your Own Constraints on Actors</a></li>
-		<li><a href="multi_threading_n.htm">Multi-Threading Notes: The Secret of High-Performance Animation in DALi</a></li>
 	</ul>
 	<li><a href="resources_n.htm">Resources: Handling Images</a>
 	<p>Enables you to manage resource images.</p></li>
@@ -73,7 +72,7 @@
 	<ul>
 		<li><a href="handle_n.htm">Handle/Body Pattern: Basic Way of Using DALi Objects</a></li>
 		<li><a href="properties_n.htm">Properties: Accessing to Properties of DALi Objects</a></li>
-		<li><a href="threads_n.htm">Thread Architecture: High-Performance Multi-Threaded Architecture of DALi</a></li>
+		<li><a href="multi_threaded_n.htm">Multi-Threaded Architecture: The Secret of High-Performance of DALi</a></li>
 	</ul>
 </ul>
     
diff --git a/org.tizen.ui.guides/html/native/dali/multi_threading_n.htm b/org.tizen.ui.guides/html/native/dali/multi_threaded_n.htm
similarity index 79%
rename from org.tizen.ui.guides/html/native/dali/multi_threading_n.htm
rename to org.tizen.ui.guides/html/native/dali/multi_threaded_n.htm
index 1c15151..534438b 100755
--- a/org.tizen.ui.guides/html/native/dali/multi_threading_n.htm
+++ b/org.tizen.ui.guides/html/native/dali/multi_threaded_n.htm
@@ -11,7 +11,7 @@
 	<script type="text/javascript" src="../../scripts/core.js" charset="utf-8"></script>
 	<script type="text/javascript" src="../../scripts/search.js" charset="utf-8"></script>
 
-	<title>Multi-Threading Notes: The Secret of High-Performance Animation in DALi</title>  
+	<title>Multi-Threaded Architecture: The Secret of High-Performance of DALi</title>  
 </head>
 
 <body onload="prettyPrint()" style="overflow: auto;">
@@ -23,22 +23,39 @@
 		<div id="toc_border"><div id="toc">
 		<p class="toc-title">Content</p>
 		<ul class="toc">
-			<li><a href="#hierachy">Multi-threaded Architecture</a></li>
-			<li><a href="#read">Reading an Animated Value</a></li>
-			<li><a href="#set">Setting a Property during an Animation</a></li>
+			<li><a href="#animations">Animations with Multi-Threading</a></li>
 		</ul>
+		<!--
 		<p class="toc-title">Related Info</p>
 		<ul class="toc">
-			<li><a href="../../../../org.tizen.native.mobile.apireference/classDali_1_1Animation.html">DALi::Animation API for Mobile Native</a></li>
-			<li><a href="../../../../org.tizen.native.wearable.apireference/classDali_1_1Animation.html">DALi::Animation API for Wearable Native</a></li>
+			<li><a href="../../../../org.tizen.native.mobile.apireference/classDali_1_1Handle.html">Dali::Handle API for Mobile Native</a></li>
+			<li><a href="../../../../org.tizen.native.wearable.apireference/classDali_1_1Handle.html">Dali::Handle API for Wearable Native</a></li>
+-->
 		</ul>
 	</div></div>
 </div>	
 
 <div id="container"><div id="contents"><div class="content">
-<h1>Multi-Threading Notes: The Secret of High-Performance Animation in DALi</h1>
+<h1>Multi-Threaded Architecture: The Secret of High-Performance of DALi</h1>
 
-<h2 id="hierachy" name="hierachy">Multi-threaded Architecture</h2>
+<p>DALi uses a multithreaded architecture in order to provide the best performance and scalability.</p>
+<ul>
+	<li><strong>Event Thread:</strong> The main thread in which application code and event handling runs.</li>
+	<li><strong>Update Thread:</strong> Updates the nodes on the scene as well as running animations and constraints.</li>
+	<li><strong>Render Thread:</strong> OpenGL drawing, texture and geometry uploading etc.</li>
+	<li><strong>Resource Thread:</strong> Loads images and decodes into bitmaps etc.</li>
+</ul>
+
+<p class="figure">Figure: DALi Thread Architecture</p>  
+	<p align="center"><img alt="Thread Architecture" src="../../images/dali_threads.png"/></p> 
+
+
+	<!-- dali todo GetCurrentPosition() -->
+
+
+<h2 id="animations" name="animations">Animations with Multi-Threading</h3>
+
+<h3 id="hierachy" name="hierachy">Multi-threaded Architecture</h3>
 
 <p>DALi animations and rendering occur in a dedicated rendering thread. This allows animations to run smoothly, regardless of the time taken to process inputs events in the application code.</p>
 
@@ -49,7 +66,7 @@
 <p class="figure">Figure: Actor hierarchy with an animation</p> 
 	<p align="center"><img alt="Actor hierarchy with an animation" src="../../images/multi_threading2.png"/></p> 
  
-<h2 id="read" name="read">Reading an Animated Value</h2>
+<h3 id="read" name="read">Reading an Animated Value</h3>
 
 <p>When a property is animatable, it can only be modified in the rendering thread. The value returned from a getter method is the value used when the previous frame was rendered.</p>
 
@@ -78,7 +95,7 @@ std::cout &lt;&lt; &quot;Current position: &quot; &lt;&lt; current.x &lt;&lt; &q
 // Other positions
 &quot;Current position: 10,10,10&quot;</pre>
 
-<h2 id="set" name="set">Setting a Property during an Animation</h2>
+<h3 id="set" name="set">Setting a Property during an Animation</h3>
 
 <p>When a property is being animated, the animation overrides all values set with other functions, such as the <span style="font-family: Courier New,Courier,monospace;">SetPosition()</span> function.</p>
 
@@ -92,6 +109,8 @@ std::cout &lt;&lt; &quot;Current position: &quot; &lt;&lt; current.x &lt;&lt; &q
 <li>Render frame</li>
 </ol>
 
+
+
     
 <script type="text/javascript" src="../../scripts/jquery.zclip.min.js"></script>
 <script type="text/javascript" src="../../scripts/showhide.js"></script>
diff --git a/org.tizen.ui.guides/html/native/dali/threads_n.htm b/org.tizen.ui.guides/html/native/dali/threads_n.htm
deleted file mode 100755
index c78457a..0000000
--- a/org.tizen.ui.guides/html/native/dali/threads_n.htm
+++ /dev/null
@@ -1,78 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-	<meta http-equiv="content-type" content="text/html; charset=utf-8" />
-	<meta http-equiv="X-UA-Compatible" content="IE=9" />
-	<link rel="stylesheet" type="text/css" href="../../css/styles.css" />
-	<link rel="stylesheet" type="text/css" href="../../css/snippet.css" />
-	<script type="text/javascript" src="../../scripts/snippet.js"></script>	
-	<script type="text/javascript" src="../../scripts/jquery.util.js" charset="utf-8"></script>
-	<script type="text/javascript" src="../../scripts/common.js" charset="utf-8"></script>
-	<script type="text/javascript" src="../../scripts/core.js" charset="utf-8"></script>
-	<script type="text/javascript" src="../../scripts/search.js" charset="utf-8"></script>
-
-	<title>Thread Architecture: High-Performance Multi-Threaded Architecture of DALi</title>  
-</head>
-
-<body onload="prettyPrint()" style="overflow: auto;">
-
-<div id="toc-navigation">
-	<div id="profile">
-		<p><img alt="Mobile native" src="../../images/mn_icon.png"/> <img alt="Wearable native" src="../../images/wn_icon.png"/></p>
-	</div>
-		<div id="toc_border"><div id="toc">
-		<p class="toc-title">Content</p>
-		<ul class="toc">
-			<li><a href="#access">Accessing to Properties</a></li>
-			<li><a href="#usage">Usages of Properties</a></li>
-		</ul>
-		<p class="toc-title">Related Info</p>
-		<ul class="toc">
-			<li><a href="../../../../org.tizen.native.mobile.apireference/classDali_1_1Handle.html">Dali::Handle API for Mobile Native</a></li>
-			<li><a href="../../../../org.tizen.native.wearable.apireference/classDali_1_1Handle.html">Dali::Handle API for Wearable Native</a></li>
-		</ul>
-	</div></div>
-</div>	
-
-<div id="container"><div id="contents"><div class="content">
-<h1>Thread Architecture: High-Performance Multi-Threaded Architecture of DALi</h1>
-
-<p>DALi uses a multithreaded architecture in order to provide the best performance and scalability.</p>
-<ul>
-	<li><strong>Event Thread:</strong> The main thread in which application code and event handling runs.</li>
-	<li><strong>Update Thread:</strong> Updates the nodes on the scene as well as running animations and constraints.</li>
-	<li><strong>Render Thread:</strong> OpenGL drawing, texture and geometry uploading etc.</li>
-	<li><strong>Resource Thread:</strong> Loads images and decodes into bitmaps etc.</li>
-</ul>
-
-<p class="figure">Figure: DALi Thread Architecture</p>  
-	<p align="center"><img alt="Thread Architecture" src="../../images/dali_threads.png"/></p> 
-
-
-	<!-- dali todo GetCurrentPosition() -->
-
-    
-<script type="text/javascript" src="../../scripts/jquery.zclip.min.js"></script>
-<script type="text/javascript" src="../../scripts/showhide.js"></script>
-</div></div></div>
-
-<a class="top sms" href="#"><img src="../../images/btn_top.gif" alt="Go to top" /></a>
-
-<div id="footer">
-<p class="footer">Except as noted, this content - excluding the Code Examples - is licensed under <a href="http://creativecommons.org/licenses/by/3.0/legalcode" target="_blank">Creative Commons Attribution 3.0</a> and all of the Code Examples contained herein are licensed under <a href="https://www.tizen.org/bsd-3-clause-license" target="_blank">BSD-3-Clause</a>.<br/>For details, see the <a href="https://www.tizen.org/content-license" target="_blank">Content License</a>.</p>
-</div>
-
-<script type="text/javascript">
-var _gaq = _gaq || [];
-_gaq.push(['_setAccount', 'UA-25976949-1']);
-_gaq.push(['_trackPageview']);
-(function() {
-var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-})();
-</script>
-
-</body>
-</html>
-
-- 
2.7.4