Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
40,277 Commits 2 Branches 31 Tags 1.1 GiB
Commit Graph

5572 Commits

Author SHA1 Message Date
halx99 36fa5ad84e Remove CC_CONSTRUCTOR_ACCESS, refer to #603 2022-03-18 21:46:07 +08:00
halx99 ea20445609 Fix ci 2022-02-25 19:38:31 +08:00
halx99 e70ea8760b Renaming extension ImGuiEXT to ImGui 
The singleton class ImGuiEXT also was renamed to ImGuiPresenter
 2022-02-25 19:03:09 +08:00
halx99 f630d1627c Fix ci 2022-02-24 19:29:50 +08:00
halx99 d8b858203e Fix linux ci 2022-02-24 19:00:49 +08:00
halx99 5b2eb79456 Update project urls 2022-02-24 18:45:25 +08:00
halx99 2b290bd734 Enable video player test case for windows 2022-02-24 18:30:58 +08:00
halx99 67c6bcec4f [cmake] Rename BUILD_LUA_LIBS to AX_ENABLE_EXT_LUA 2022-02-17 21:31:39 +08:00
halx99 7f81b65596 [Android] Upgrade MIN_SDK_VERSION from 16 to 17 2022-01-30 20:38:01 +08:00
halx99 cfe6390de3 [Android] By default, build single arch: arm64-v8a 2022-01-30 20:36:41 +08:00
halx99 722b6af026 [Android][freetype] Change streamingParsingEnabled to true 
Add noCompress config to build.gradle for all templates & tests project

Exists project, please add follow config

android {

// Other configs
// ...

// noCompress config
aaptOptions {
   noCompress 'mp3','ogg','wav','mp4','ttf','ttc'
}

}
 2022-01-29 14:54:32 +08:00
halx99 f0fa7780d7 Improve gradle script to find cmake 2022-01-28 18:25:50 +08:00
halx99 931da84bc3 Fix gradle wrapper url 2022-01-28 13:41:18 +08:00
halx99 716b20cf6b Update recommend android studio and gradle 
- Android Studio 2021.1.1+ (More intelligent)
- Gralde wrapper to 7.2: https://services.gradle.org/distributions/gradle-7.2-bin.zip.zip
- Gradle Plugin to 7.1: com.android.tools.build:gradle:7.1.0

These upgrades will fix the issue: #573
 2022-01-28 12:47:05 +08:00
halx99 11360497ea Update gradle wrapper to 6.9.2 2022-01-27 18:44:59 +08:00
halx99 a00f181b30 Update chmod 2022-01-08 12:23:14 +08:00
halx99 21e4684703 Fix lua-tests linkage for windows 2022-01-04 10:33:23 +08:00
halx99 3d7218a0eb Fix #570 
a. fix lua build error
b. still use separated link jni libs
 2022-01-04 09:40:27 +08:00
halx99 a651879ee6 Tidy audio folder 2022-01-03 11:34:58 +08:00
halx99 e534dd66c0 Rename core folder name 2021-12-31 14:39:08 +08:00
halx99 b5b4b1e5d8 Committing clang-format changes 2021-12-29 11:31:28 +00:00
deal 96d6cd7965
Update JNITest.cpp 2021-12-29 16:22:07 +08:00
halx99 8fd4a8afc3 Fix android ci 2021-12-29 13:44:39 +08:00
halx99 1e9ad9d240 string_view for cpp-tests 2021-12-28 17:20:17 +08:00
halx99 ce5adf35f7 Committing clang-format changes 2021-12-28 08:06:23 +00:00
halx99 367ae2a23c string_view for tests 2021-12-28 15:58:56 +08:00
halx99 2e0cc940ee [HttpClient] Use `byte_buffer` instead `std::vector<char>` 2021-12-10 19:15:48 +08:00
halx99 b459acbcf7 Remove all unnecessary nothrow 2021-12-08 00:11:53 +08:00
aismann 8f01f2782f Improve performance on cpp-tests release version controlling COCOS2D_DEBUG 2021-12-01 15:03:57 +01:00
halx99 57972411e5
Update UnitTest.cpp 2021-11-19 09:21:17 +08:00
halx99 1d980f4f52 Fix unit test 2021-11-11 18:41:59 +08:00
halx99 95a1734cd7 Add `CCValue` int64_t/uint64_t support 2021-11-09 14:29:15 +08:00
halx99 45607062bd Fix ci 2021-10-25 20:29:40 +08:00
halx99 857d2c177f Optimize cmake scripts 2021-10-12 15:39:37 +08:00
halx99 86a28937fc
Merge pull request #521 from adxeproject/refine-lua-loader 
Refactor lua loader, reload lua with file name as-is
 2021-10-12 14:18:02 +08:00
halx99 846231e2f1 Fix #522 2021-10-12 13:16:27 +08:00
halx99 c270fc3579 Remvoe lua 64bit bytecode spec 
a. since we know how to compile compatible bytecode for both plainlua and LuaJIT
 2021-10-11 23:26:25 +08:00
halx99 bbd3a78ae4 Improve lua workflow on windows 
a. Use working directory as default resource root on windows
b. Don't copy res and scripts to build binary dir on windows
c. Always build plainlua as dll on windows for fast debug
d. Remove 64bit spec search path for lua script
 2021-10-07 18:44:34 +08:00
halx99 92890788f8 Update copyright notice [skip ci] 2021-10-06 18:47:07 +08:00
halx99 ff57086dd6 Fix #516 2021-10-06 11:24:39 +08:00
rh101 9857ea8732 [setup.py] Add download support. Add NuGet CLI download to tools folder. 
Download NuGet Microsoft.Web.WebView2 package version 1.0.992.28
Add support for WebView for Windows builds.
 2021-10-04 18:55:01 +11:00
aismann e785d1a5d7 Update PhysicsTest.cpp 2021-09-08 10:16:14 +02:00
halx99 f1cdfdca52 Merge empty project 
a. Remove cpp-empty-test, use HelloCpp as starter
b. Remove lua-empty-test, use HelloLua as starter
 2021-09-07 17:24:07 +08:00
halx99 d73d937894 Fix #493, sync uri parse unit test 2021-09-04 00:22:47 +08:00
halx99 bc6ad50a4f Fix #492 for win64 require larger stack for cpp-tests: 41 2021-09-03 20:37:34 +08:00
rh101 bc0a5f42f8 Windows callback requires `long` return type 2021-09-02 21:21:28 +10:00
rh101 78236079e8 More %ld to %d changes 2021-09-02 17:54:13 +10:00
rh101 de182c8360 Change %ld to %d for 32bit data types 
Regenerate LUA bindings
 2021-09-02 17:46:22 +10:00
rh101 d8ef523abb Fix typo 2021-09-02 17:05:33 +10:00
rh101 386f7deb9d Use explicit cast to uintptr_t prior to casting to int type. 2021-09-02 16:52:40 +10:00
rh101 3c5fa51a01 Fix for compilation issue due to pointer to int32 conversion. 
Fix warning.
 2021-09-02 16:38:23 +10:00
rh101 e5bbea3cca Test code updated with long to int32_t changes 2021-09-02 15:48:05 +10:00
halx99 a2346d5e1f Merge branch 'dev' of https://github.com/adxeproject/adxe into dev 2021-09-01 10:10:46 +08:00
halx99 21f27285a0 Fix #486, re-enable custom shader batch draw 2021-08-31 16:25:45 +08:00
halx99 cb81a61530 Refactor layer 
Reimplement LayerColor and LayerGradient based on sprite for auto batch draw
 2021-08-30 19:47:53 +08:00
aismann cbeeb8d8ab Debug 64bit build error 
Severity	Code	Description	Project	File	Line	Suppression State
Error (active)	E0075	operand of '*' must be a pointer but has type "bool"	cpp-tests	D:\______\GitHub\adxe\tests\cpp-tests\Classes\SpineTest\SpineTest.cpp	153
 2021-08-27 07:47:22 +02:00
halx99 11434287cd
Merge pull request #466 from rh101/fix-sprite-test-crashes 
Fixes for crashes in sprite and sprite cache tests
 2021-08-19 14:35:44 +08:00
rh101 c9ebafe501 Fixes for crashes in sprite and sprite cache tests 2021-08-19 15:43:18 +10:00
aismann a9569ca061 fix 2021-08-18 06:00:43 +02:00
aismann 5b3748cdd6 Important API change for naming convention 
rename
class DebugDraw
to
PhysicsDebugNodeBox2D
 2021-08-18 05:23:03 +02:00
aismann 780d4e6294 cleanup and improvement 2021-08-18 04:16:21 +02:00
rh101 188345e42a Fix incorrect reference count check in SpriteFrameCache::removeUnusedSpriteFrames 
[BaseTest] Ensure unused frames are released before attempting to free unused textures
 2021-08-17 15:26:44 +10:00
rh101 b3e045b387 Use integer identifier for sprite sheet format. 
Revert method name addSpriteFramesWithFileAndTexture back to addSpriteFramesWithFile
 2021-08-17 14:04:45 +10:00
rh101 5199bb087a Update sprite sheet API to allow custom sprite sheet texture filename to be used 2021-08-17 09:04:51 +10:00
aismann 9f2ab0ef28
More improvements (#455) 2021-08-14 10:28:28 +08:00
RH 4716456e33
Support custom texture atlas formats (#284) 
* Allow support for custom texture atlas formats other than PLIST.

* Revert usage of emplace_back to push_back to ensure support for older compilers.

* Update test to support SpriteFrameCache::addSpriteFramesWithFile

* Re-add SpriteFrameCache::addSpriteFramesWithFileContent

* Change order of SpriteFramesFromFileContent test back to what it previously was

* Remove sprite sheet and all frames associated with it correctly

* Move sprite loader classes into their own files to clean up CCSpriteFrameCache

* Remove redundant line and update comment

* Fix formatting to match adxe code style

* Fix typo

* Add custom sprite sheet loader test using JSON-array sprite atlas format.
Simplify sprite sheet loader interface by adding identifier to the custom sprite sheet loader implementation.

* Add newline at the end of the file
 2021-08-13 14:52:58 +08:00
halx99 56edf5c339 Fix xcode build warnings 2021-08-12 15:54:16 +08:00
aismann 861c356bb4 update CMakeList.txt 2021-08-12 06:02:01 +02:00
aismann 7b7a3a8ae7 Box2D_TestBed_improvement 2021-08-12 05:54:06 +02:00
halx99 6ee687302b Xcode Embed Frameworks support 
refer to: https://gitlab.kitware.com/cmake/cmake/-/issues/22412#note_997156
 2021-08-10 11:43:16 +08:00
halx99 97e5896325 Update cmake link 2021-08-10 10:46:11 +08:00
aismann c2b44cc7e1 some beauties 2021-08-06 10:19:54 +02:00
aismann 56b99eff6a Box2D - Basic ready for use 2021-08-06 09:35:29 +02:00
aismann f5077bfb0f
Add DebugDraw to Box2DTest, Improve Box2D-Testbed add some new classes to physics-nodes (#444) 
* Update AppDelegate.cpp

Add '*Debug*' on the title

* Update CCPhysicsDebugNodeBox2D.h

* Improve Box2D-TestBed

* improvements

* Update CCPhysicsDebugNodeBox2D.cpp

* Improve the 2d physics stuff

* dirty fix for build android:

* Fix fatal error: 'GLFW/glfw3.h' file not found

* Add DebugDraw to  Box2DTest, Improve Box2DTestBed, Add some new physicnodes

* fix settings, unknow  labelDebugDraw;
 2021-08-05 17:23:55 +08:00
aismann 36a6ba2a33
Merge pull request from improve Box2D-TestBed (#437) 
* Update AppDelegate.cpp

Add '*Debug*' on the title

* Update CCPhysicsDebugNodeBox2D.h

* Improve Box2D-TestBed

* improvements

* Update CCPhysicsDebugNodeBox2D.cpp
 2021-07-19 18:33:03 +08:00
halx99 abd98f50aa HttpClient cookie support 2021-07-19 12:26:25 +08:00
halx99 ffcd4770cb Move GL macros to backend MacrosGL.h 
a. Fix box2d-testbed crash on macos and ios
b. User should avoid use them at application
 2021-07-07 13:52:56 +08:00
halx99 5161d4135f
Fix spell case (#424) 
* Fix file name case [skip ci]

* Rename Test.cpp to test.cpp
 2021-07-07 04:01:08 +08:00
aismann 5735a85862
Merge pull request #423 from aismann/dev 
Enable box2d testbed on linux/macos
 2021-07-07 02:29:38 +08:00
aismann 5ab1fdbf57
Merge pull request #419 from aismann/Box2D-TestBed 
* Starting "Box2D - TextBed" adaption (most demos working)

* fix CMakeList.txt

* Update CMakeLists.txt

* Update CMakeLists.txt

* Update Box2dTest.cpp

* Update tests.h

* Update CCPhysicsDebugNodeBox2D.cpp

* Update controller.cpp
 2021-07-06 21:02:47 +08:00
halx99 3c25f74ef1 Fix case for linux 2021-07-06 18:46:07 +08:00
halx99 3d7251e7e3 ChipmunkTestBed non-win platform adapte 2021-07-06 18:40:24 +08:00
halx99 8efca2ea3a HttpClientTest tag [skip ci] 2021-07-06 11:43:57 +08:00
halx99 45ad0d86fe Implement HttpClient::sendSync with std::promise 2021-07-06 11:39:53 +08:00
halx99 7405c5781b HttpClient handle content type from custom headers 2021-07-05 14:24:04 +08:00
halx99 ec904ed2b2 Downloader background task [ci build] 2021-07-04 19:26:18 +08:00
halx99 79b13d2372 Fix #413 2021-07-04 16:40:34 +08:00
halx99 f260546821 Remove yasio test since we implement HttpClient based on it [ci build] 2021-07-02 19:02:38 +08:00
aismann 8498203a47
Chipmunk2D TestBed finished (#410) 
* Improve Chipmunk2D - TestBed

* Code cleanup, keyboard fix, should be finished now (behavior like the original Chipmunk2D - demos with Sokol as renderer)

* Update ChipmunkTestBed.h

* Fix wrong merge
 2021-06-30 18:57:41 +08:00
aismann e7d2df5ae2
Update ChipmunkTestBed.h (#412) 2021-06-30 17:13:55 +08:00
aismann 158bd118e4
Improve Chipmunk2D - TestBed (#404) 2021-06-30 09:52:54 +08:00
aismann 39be77144c
Fix CCPhyhsicsDebugNode Polygon stuff, add all bench tests, ... (#403) 
* Improve Chipmunk2D - TestBed, add same more debug draw stuff and some fixes too.

* Improve Chipmunk2D- TestBed and starting the code cleanup ...

* Fix CCPhyhsicsDebugNode Ploygon stuff,  add all bench tests, improve  same demos, code cleanup
 2021-06-26 17:46:06 +08:00
aismann 67a505ef4f
Improve Chipmunk2D - TestBed. Starting code cleanup. (#399) 
* Improve Chipmunk2D - TestBed, add same more debug draw stuff and some fixes too.

* Improve Chipmunk2D- TestBed and starting the code cleanup ...
 2021-06-25 21:31:13 +08:00
aismann c5d82faa9e Improve Chipmunk2D - TestBed, add same more debug draw stuff and some fixes too. 2021-06-25 17:01:23 +08:00
halx99 c9eb1a7de4
Merge branch 'dev' into Chipmunk2D 2021-06-24 17:04:04 +08:00
aismann df58dd753c Add springs (draw), add Copyright, improve Chipmunk2d - Testbed 2021-06-24 09:54:02 +02:00
halx99 2397d54daf
Fix ci [ci build] 2021-06-24 12:48:25 +08:00
halx99 a379f936d8
Reimplement HttpClient based on yasio (#390) 
* [WIP] Reimplement HttpClient based on yasio
This change will make HttpClient support concurrency request

* [WIP] Reimplement HttpClient based on yasio
a. timeoutForRead support
b. Improve code

* [WIP] Reimplement HttpClient based on yasio [ci build]

* [WIP] Fix ci [ci build]

* [WIP] Reimplement HttpClient based on yasio [ci build]
PUT,DELETE support

* [WIP] Reimplement HttpClient based on yasio [ci build]
HttpClientTest works

* Update HttpClient.cpp

* HttpClientTest: enable sslVerifaction test

* Update HttpResponse.h

* Sync luabindings [ci build]

* Add chrome UA test

* Fix ci [ci build]

* The timer for read timeout should be associated with per channel

* Remove unused function

* Update url
 2021-06-24 12:33:07 +08:00
halx99 581a792155 Delay scene default camera init, see also #392 
This change will make sure user can change window or design size before scene init
 2021-06-24 02:23:02 +08:00
halx99 c9358397b7 Fix #392 2021-06-24 01:23:29 +08:00
aismann 07ffbedc3c Update CMakeLists.txt 2021-06-24 00:21:36 +08:00
aismann 528ced1c9d Improve Chipmunk2D - TestBed, some more examples, keyboard support, display rearange 2021-06-24 00:21:36 +08:00
aismann df1a6e5feb Update CMakeLists.txt 2021-06-23 17:32:34 +02:00
aismann 48bc8144a5 Improve Chipmunk2D - TestBed, some more examples, keyboard support, display rearange 2021-06-23 17:09:48 +02:00
aismann 2ce88d571b
some more Chipmunk2D TestBed examples, mouse interaction, ... (#389) 
* Chipmunk2D - TestBed  Add more examples and improve using the original source

* Improve using original chipmunk2d demo code, add more example, add interactions with mouse
 2021-06-23 14:25:44 +08:00
aismann 85347cd438 Chipmunk2D - TestBed Add more examples and improve using the original source 2021-06-18 16:52:56 +08:00
halx99 7ee1785858 Improve Lua RTTI performance [ci build] 2021-06-18 12:23:10 +08:00
aismann 69e54bb74d
Improved Chipmunk2D - TestBed (#381) 
* Improved Chipmunk2D - TestBed

* for windows only (at this moment)

* Update CmakeLists.txt

* fix CmakeLists.txt

* some more fixes

* more fixes

* more fixes

* Create ChipmunkDemo.h

* Fix CMakeList.txt; improve Chipmunk TestBed
 2021-06-17 14:22:52 +08:00
aismann a491997731
Improve the "Physics part" (#379) 
* 1. Add "initial" Chipmunk - TestBed

More demos comes later.

* 2. Removed unused source

* Update CMakeLists.txt

* Some fixes #1

* workaround #1

* workaround #1
 2021-06-16 19:34:09 +08:00
halx99 bde4726807 Update yasio [ci build] 2021-06-14 22:54:50 +08:00
halx99 61af6d75f9 Update readme guide and fixup [ci build] 2021-06-08 21:53:18 +08:00
halx99 29015e1cd7 Make gradle utils file as shared [ci build] 2021-06-02 06:27:19 +08:00
halx99 f0dc1582fb [Gradle] Find ndk with env ANDROID_NDK [ci build] 2021-06-02 05:37:18 +08:00
halx99 adce3298de Fix lua build [ci build] 2021-05-24 19:18:15 +08:00
halx99 d13746a035
Fix ci [ci build] 2021-05-24 17:20:28 +08:00
HALX99 a42f9ac25c
Renaming refactor (#353) [ci build] 2021-05-18 16:40:30 +08:00
halx99 97e8d4c58a Replace jcenter with mavenCentral [ci build] 2021-05-15 12:15:38 +08:00
halx99 bb1871b0e0 Gradle Plugin no longer support cmake 3.10.0+ 2021-05-15 11:58:56 +08:00
halx99 412a6fa9e2 Fix android ci [ci build] 2021-05-15 00:12:41 +08:00
halx99 798e0fe1a1 Update gradle stubs [ci build] 
a. wrapper  to  6.9
b. plugin to 4.2.0
 2021-05-14 12:11:19 +08:00
halx99 3348f10813 Make tests could build at external location [ci build] 2021-05-02 17:23:39 +08:00
halx99 7f1ca55a97 NavMesh Use lz4 instead fastlz [ci build] 2021-04-26 22:39:44 +08:00
halx99 c1063ea03d Fix cpp-tests exit crash when tableView in scrolling [ci build] 2021-04-26 17:55:55 +08:00
halx99 49c1318fc1 Explicit set cmake minimum version at app/build.gradle [ci build] 2021-04-22 11:40:53 +08:00
halx99 e8c1d7bc2c Set cmake min version to 3.10 [ci build] 2021-04-21 14:05:44 +08:00
halx99 3ff5b16847 Ensure build native first before compile java code 2021-04-20 20:25:32 +08:00
halx99 d33ffa67cd Set gradle-wrapper to 6.8.3 [ci build] 2021-04-08 22:42:15 +08:00
halx99 958f6c3a93 Properly set gc mode for lua-5.4 [ci build] 2021-03-27 19:49:19 +08:00
halx99 9972ddd71c fix lua-tests cmake script 2021-03-26 17:10:37 +08:00
halx99 adf3483943 Fix CMakeLists for separating test projects [ci build] 2021-03-15 09:50:32 +08:00
HALX99 138781151a
Fix depth stencil state/desc (#321) 
* Fix ds state

* fix 3d object not render

* Update DepthStencilStateGL.cpp

* fix ds, not complete

* fix image ref incorrect

* Fix metal captureScreen

* Share ds desc
needs restore properly after non-default render target destroy.

* fix gl compile

* Sync ds desc

* Only set vertex & index buffer once for batch draw

* Add set/get ds desc for renderer

* Refine code style

* Fix RenderTextureTest
a. should restore stencil desc properly

* Sync gl captureNode

* Sync GL
 2021-01-31 22:22:52 +08:00
aismann 057642921b Update controller.cpp 
"Node: Physics" using Chipmunk2D (hardcoded on e.g.: CCPhysicsBody.cpp)

Maybe a Wiki entry is also usefull?
 2020-12-20 07:11:13 +01:00
aismann 4ef25e25cf same/correct wording style 2020-12-03 21:33:52 +01:00
HALX99 bb9b40689c
Merge pull request #295 from aismann/master 
CCPhysicsSprite(Box2D/Chipmunk2D) cleanup, some other small improvements...
 2020-12-02 08:39:58 -08:00
halx99 108399ede3 Unify CC_COMPAT_GL to control renderer backend 
win32: google angle
mac: NSGL
ios: GLES
 2020-12-02 03:03:05 -08:00
aismann dbf81d7511 Removed CC_ENABLE_CHIPMUNK_INTEGRATION from class CCPhysicsDebugNode 
CCPhysicsDebugNode.cpp has only the Chipmunk2D implementation
 2020-12-01 17:58:34 +01:00
aismann 72be372699 CCPhysicsSprite(Box2D/Chipmunk2D) cleanup, some other small improvements too 
CCPhysicsSprite(Box2D/Chipmunk2D) cleanup and small improvements on PhysicsTest
 2020-12-01 16:39:28 +01:00
aismann 5e249bf6f8 Chipmunk2D and Box2D works together now (add two new classes) 
add class PhysicsSpriteChipmunk2D
add class PhysicsSpriteBox2D

Improve window size problem with ImGuiEXTTest
 2020-12-01 10:15:30 +01:00
Eismann eee60b9d99 Same as on 3.17 (with small changes) 2020-11-23 07:46:09 +01:00
Eismann c364c9adb5 Update Box2dTest.h 2020-11-20 07:05:21 +01:00
Eismann 424666e59c Update CMakeLists.txt 2020-11-20 06:38:09 +01:00
Eismann 7c06461594 add Box2D to CMakeList 2020-11-20 06:19:30 +01:00
Eismann 178ce9f5cf Add BOX2D test 
Add BOX2D test
 2020-11-20 04:51:47 +01:00
halx99 46287b84c2 Rollback gradle plugin version 4.0.1, since there is no benefit upgrade to 4.1.0 2020-11-12 22:50:38 +08:00
halx99 755714c103 CMake, use file TO_CMAKE_PATH instead string replace [ci build] 2020-11-12 22:47:35 +08:00
halx99 7cf17f70c3 Remove unused file 2020-11-11 16:22:03 +08:00
halx99 5da2894e1b Prepre for box2d-2.4.1 2020-11-08 13:11:40 +08:00
halx99 c563bc295f Sync folder for binding generator config 2020-11-01 20:18:50 +08:00
halx99 5b8eaf1005 fix fairygui-tests ios project file 2020-10-27 00:24:55 -07:00
halx99 f13bc32512 Build android arch arm64-v8a only for ci, fix test case compiling warning 2020-10-26 11:12:55 +08:00