Update AS config to 2021.3.1.p1 and Fix the Tween error with queue ac…

…tions.

ChangeLog.md

@@ -1,3 +1,10 @@
+## v0.7.1
+
+_`2022.10.20 UTC+8 16:00`_
+
+* Fix the `Tween` error with queue actions. 
+
+
 ## v0.7.0
 
 _`2021.8.18 UTC+8 10:42`_

Engine/Toolkit/Utils/Tween.c

@@ -9,7 +9,7 @@
  * CodeStyle: https://github.com/scottcgi/Mojoc/blob/master/Docs/CodeStyle.md
  *
  * Since    : 2016-6-8
- * Update   : 2021-8-16
+ * Update   : 2022-10-19
  * Author   : scott.cgi
  */
 
@@ -32,6 +32,11 @@ typedef struct
      * Target's current running actions.
      */
     ArrayList(TweenAction*)  current[1];
+
+    /**
+     * A queue action currently is running in current list.
+     */
+    TweenAction*             queueAction;
 }
 Tween;
 
@@ -61,6 +66,8 @@ static inline Tween* GetTween()
         AArrayList ->Clear(tween->current);
     }
 
+    tween->queueAction = NULL;
+
     return tween;
 }
 
@@ -132,20 +139,6 @@ static inline void SetActionValue(TweenAction* action)
 }
 
 
-static void DequeueAction(Tween* tween)
-{
-    // get a queue action to run
-    TweenAction* action = AArrayQueue_Dequeue(tween->queue, TweenAction*);
-
-    if (action != NULL)
-    {
-        // add the running queue action into current list
-        AArrayList_Add(tween->current, action);
-        SetActionValue(action);
-    }
-}
-
-
 static void* RunActions(Array(TweenAction*)* actions, void* tweenID)
 {
     Tween* tween;
@@ -190,14 +183,17 @@ static void* RunActions(Array(TweenAction*)* actions, void* tweenID)
         }
     }
 
-    DequeueAction(tween);
-
     return tweenID;
 }
 
 
 static void RemoveCurrentActionByIndex(Tween* tween, TweenAction* action, int index)
 {
+    if (action == tween->queueAction)
+    {
+        tween->queueAction = NULL;
+    }
+
     AArrayList->RemoveByLast(tween->current, index);
     AArrayList_Add(actionCacheList, action);
 }
@@ -258,6 +254,10 @@ static bool TryRemoveAllActions(void* tweenID)
             AArrayList_Add(actionCacheList, action);
         }
 
+        // if queueAction not NULL it must be in tweenData->current
+        // so just set NULL
+        tween->queueAction = NULL;
+
         return true;
     }
 
@@ -308,6 +308,10 @@ static bool TryCompleteAllActions(void* tweenID, bool isFireOnComplete)
             AArrayList_Add(actionCacheList, action);
         }
 
+        // if queueAction not NULL it must be in tweenData->current
+        // so just set NULL
+        tween->queueAction = NULL;
+
         return true;
     }
 
@@ -340,7 +344,20 @@ static void Update(float deltaSeconds)
     for (int i = tweenRunningMap->elementList->size - 1; i > -1; --i)
     {
         Tween* tween = AArrayIntMap_GetAt(tweenRunningMap, i, Tween*);
-
+
+        // get a queue action to run
+        if (tween->queueAction == NULL)
+        {
+            tween->queueAction = AArrayQueue_Dequeue(tween->queue, TweenAction*);
+
+            if (tween->queueAction != NULL)
+            {
+                // add the running queue action into current list
+                AArrayList_Add(tween->current, tween->queueAction);
+                SetActionValue(tween->queueAction);
+            }
+        }
+
         if (tween->current->size == 0)
         {
             // all actions complete so remove tweenData and push to cache
@@ -382,13 +399,8 @@ static void Update(float deltaSeconds)
                 {
                     action->OnComplete(action);
                 }
-
-                RemoveCurrentActionByIndex(tween, action, j);
 
-                if (action->isQueue)
-                {
-                    DequeueAction(tween);
-                }
+                RemoveCurrentActionByIndex(tween, action, j);
             }
         }
     }

README.md

@@ -1,7 +1,7 @@
 <img src="./Docs/Images/Logo.png" width="176" height="228" alt="Mojoc Logo" title="Mojoc Logo" />
 
 
-## Mojoc v0.7.0
+## Mojoc v0.7.1
 
 Mojoc is an open-source, cross-platform, pure C game engine. It is based on OpenGLES3 and written in C99. It currently works on IOS and Android, but can easily be extended to other platforms, and will support more platforms in the future.
 
@@ -39,9 +39,6 @@ Less is more, simple is better, simplify complex ideas.
 ## Published Games
 Mojoc has been used for a cross-platform Android and IOS game. 
 
-* **SuperLittleRed** is a bow and arrow shooting game, very challenging for your operation.
-  * [App Store](https://itunes.apple.com/cn/app/id1242353775)
-  * [Google Play](https://play.google.com/store/apps/details?id=com.SuperLittleRed)
 
 ## Samples
 The samples will show all aspects of the Mojoc features. Each platform will provide native building project for native platform editor. For example: Android provides AndroidStudio project, IOS provides XCode project.
@@ -50,7 +47,7 @@ Currently there is only one sample, which is a simplfied version of the publishe
 
 The compiled and playable apk is here:
 
-* [SuperLittleRed-2.2.0.apk](./Samples/Apk/SuperLittleRed-2.2.0.apk?raw=true)
+* [SuperLittleRed-2.2.0.apk](./Samples/Apk/SuperLittleRed-2.2.0.apk?raw=true) is a bow and arrow shooting game, very challenging for your operation.
 
 <img src="./Docs/Images/SuperLittleRed-Sample.gif" width="400" height="225" alt="SuperLittleRed-Sample" title="SuperLittleRed-Sample" />
 

Samples/SuperLittleRed/Android/app/build.gradle

@@ -1,13 +1,14 @@
 apply plugin: "com.android.application"
 
 android {
-    compileSdkVersion 29
-    buildToolsVersion "30.0.3"
+    compileSdkVersion 32
+    buildToolsVersion "33.0.0"
     defaultConfig {
         applicationId "com.Mojoc.Samples.SuperLittleRed"
-        minSdkVersion 29
+        minSdkVersion 30
         ndk {
             abiFilters "armeabi-v7a", "arm64-v8a"
+            ndkVersion "25.1.8937393"
         }
         externalNativeBuild {
             cmake {
@@ -32,6 +33,7 @@ android {
     }
     productFlavors {
     }
+    namespace 'com.Mojoc.Samples.SuperLittleRed'
 }
 
 dependencies {

Samples/SuperLittleRed/Android/build.gradle

@@ -6,7 +6,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.0'
+        classpath 'com.android.tools.build:gradle:7.3.1'
         // NOTE: Do not place your application dependencies here; they belong
     }