diff --git a/ChangeLog.md b/ChangeLog.md index 2e6b03bc..9b301974 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,20 +1,26 @@ -## Developing +## v0.6.0 + +_`2021.2.6 UTC+8 13:26`_ -* Rename Ortho to Orthographic. -* Fix precision problem of TweenEase BackInElasticOut. -* Add some collision algorithms to the `Math`. * Refactor the PhysicsCollision implementation. -* Optimize the implementation of Json `SkipString`. -* Fix the bug of Json `parseObject` that modifying the json string. * Remove `RotateM` function in `Matrix.c`. -* Optimize matrix `ratation`. -* Add `rotatioinX` and `rotationY` in `Drawable`. + +* Rename Ortho to Orthographic. * Rename `Interpolates` to `Easing` in `ATweenEase`. + +* Add some collision algorithms to the `Math`. +* Add `rotatioinX` and `rotationY` in `Drawable`. * Add `EasingTimeFns` in `ATweenEase`. + +* Fix precision problem of TweenEase BackInElasticOut. * Fix `Bounce` function error when easing complete in `TweenEase`. * Fix bug `off_t` convert to `off_t*` in function `OpenFileDescriptor` of `File.c`. +* Fix the bug of Json `parseObject` that modifying the json string. + +* Optimize matrix `ratation`. * Optimize easing functions that delete all redundant `else` keywords. * Optimize easing functions `ElasticIn, Out, IntOut`. +* Optimize the implementation of Json `SkipString`. ## v0.5.0 diff --git a/Engine/Toolkit/Utils/Json.c b/Engine/Toolkit/Utils/Json.c index 3a341f33..8219bbe9 100644 --- a/Engine/Toolkit/Utils/Json.c +++ b/Engine/Toolkit/Utils/Json.c @@ -430,7 +430,7 @@ static JsonValue* ParseObject(const char** jsonPtr) const char* strStart; int keyLen = SkipString(jsonPtr, &strStart); - char key[keyLen]; + char key[keyLen + 1]; // make string end key[keyLen] = '\0'; diff --git a/README.md b/README.md index dab78ae9..3cb21a4c 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ Mojoc Logo -## Mojoc v0.5.0 +## Mojoc v0.6.0 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. @@ -49,7 +49,7 @@ Currently there is only one sample, which is a simplfied version of the publishe The compiled and playable apk is here: -* [SuperLittleRed-2.0.1.apk](https://github.com/scottcgi/Mojoc/blob/master/Samples/Apk/SuperLittleRed-2.0.1.apk?raw=true) +* [SuperLittleRed-2.0.2.apk](https://github.com/scottcgi/Mojoc/blob/master/Samples/Apk/SuperLittleRed-2.0.2.apk?raw=true) SuperLittleRed-Sample @@ -127,12 +127,10 @@ The roadmap shows the direction of the Mojoc development. * Game editor implement by Mojoc self. * Game script language `"MojoScript"`, and implement by C language with Toolkit. - ## Support * :video_game: Play Mojoc [Published Games](#published-games). * :octocat: Star & Issue & Fork on GitHub, or share **Mojoc** project to anyone. * :coffee: If the source code is **useful** for you, maybe buy me a coffee via [Paypal-0.99](https://www.paypal.me/PayScottcgi/0.99). - ## :loop: diff --git a/Samples/Apk/Sample-SuperLittleRed.apk b/Samples/Apk/Sample-SuperLittleRed.apk deleted file mode 100644 index ca01afc0..00000000 Binary files a/Samples/Apk/Sample-SuperLittleRed.apk and /dev/null differ diff --git a/Samples/Apk/SuperLittleRed-2.0.1.apk b/Samples/Apk/SuperLittleRed-2.0.2.apk similarity index 87% rename from Samples/Apk/SuperLittleRed-2.0.1.apk rename to Samples/Apk/SuperLittleRed-2.0.2.apk index 32bc25b1..864b754b 100644 Binary files a/Samples/Apk/SuperLittleRed-2.0.1.apk and b/Samples/Apk/SuperLittleRed-2.0.2.apk differ diff --git a/Samples/SuperLittleRed/Android/app/build.gradle b/Samples/SuperLittleRed/Android/app/build.gradle index ab70da1f..463f1230 100644 --- a/Samples/SuperLittleRed/Android/app/build.gradle +++ b/Samples/SuperLittleRed/Android/app/build.gradle @@ -5,7 +5,7 @@ android { buildToolsVersion "29.0.3" defaultConfig { applicationId "com.Mojoc.Samples.SuperLittleRed" - minSdkVersion 21 + minSdkVersion 25 ndk { abiFilters "armeabi-v7a", "arm64-v8a" } diff --git a/Samples/SuperLittleRed/IOS/SuperLittleRed.xcodeproj/project.pbxproj b/Samples/SuperLittleRed/IOS/SuperLittleRed.xcodeproj/project.pbxproj index c8c446c0..5ac307cb 100644 --- a/Samples/SuperLittleRed/IOS/SuperLittleRed.xcodeproj/project.pbxproj +++ b/Samples/SuperLittleRed/IOS/SuperLittleRed.xcodeproj/project.pbxproj @@ -1287,7 +1287,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0820; - LastUpgradeCheck = 1130; + LastUpgradeCheck = 1240; ORGANIZATIONNAME = scott.cgi; TargetAttributes = { 17A541A51E76F8BE00EB9D00 = { @@ -1472,6 +1472,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -1500,7 +1501,7 @@ ../Code/, ../../../, ); - IPHONEOS_DEPLOYMENT_TARGET = 10.3; + IPHONEOS_DEPLOYMENT_TARGET = 11.4; LIBRARY_SEARCH_PATHS = "../../../Engine/ThirdParty/**"; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; @@ -1536,6 +1537,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -1558,7 +1560,7 @@ ../Code/, ../../../, ); - IPHONEOS_DEPLOYMENT_TARGET = 10.3; + IPHONEOS_DEPLOYMENT_TARGET = 11.4; LIBRARY_SEARCH_PATHS = "../../../Engine/ThirdParty/**"; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; @@ -1576,7 +1578,7 @@ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; DEVELOPMENT_TEAM = UJ447HWZSX; INFOPLIST_FILE = "$(SRCROOT)/Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 11.4; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LIBRARY_SEARCH_PATHS = "$(inherited)"; PRODUCT_BUNDLE_IDENTIFIER = com.Mojoc.Samples.SuperLittleRed; @@ -1597,7 +1599,7 @@ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; DEVELOPMENT_TEAM = UJ447HWZSX; INFOPLIST_FILE = "$(SRCROOT)/Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 11.4; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LIBRARY_SEARCH_PATHS = "$(inherited)"; PRODUCT_BUNDLE_IDENTIFIER = com.Mojoc.Samples.SuperLittleRed;