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

269 Commits

Author SHA1 Message Date
aismann 39dbbc4713 More improvements (#455) 2021-08-14 10:28:28 +08:00
RH 2c0f04c99b 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 3905654659 Fix xcode build warnings 2021-08-12 15:54:16 +08:00
halx99 84a84a8931 Merge: 39eb09daad 861c356bb4 
Merge pull request #447 from aismann/Box2D_TestBed_improvement

Box2D_TestBed_improvement
 2021-08-12 15:34:24 +08:00
aismann d0a18036b5 Update README.md 2021-08-12 07:03:14 +02:00
aismann 24a99d6e27 update CMakeList.txt 2021-08-12 06:02:01 +02:00
aismann c94562d417 Box2D_TestBed_improvement 2021-08-12 05:54:06 +02:00
halx99 dc3b5292d7 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 48505bc10f Update cmake link 2021-08-10 10:46:11 +08:00
halx99 50c270e8f5 Merge: 0a682f0dc1 c2b44cc7e1 
Merge pull request #445 from aismann/Box2D-Basic-Clean-code-and-speed-optimized

Box2D - Basic ready for use (clean code and speed optimized)
 2021-08-06 19:40:32 +08:00
aismann 97a6104516 Update README.md 2021-08-06 12:19:45 +02:00
aismann 7ec9850fa2 some beauties 2021-08-06 10:19:54 +02:00
aismann 4c6f9fcc3d Box2D - Basic ready for use 2021-08-06 09:35:29 +02:00
aismann b5d0326e6e 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 c612333389 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 d76a43406c HttpClient cookie support 2021-07-19 12:26:25 +08:00
halx99 ed3a0d05ec 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
aismann a46bc403ae Merge pull request #423 from aismann/dev 
Enable box2d testbed on linux/macos
 2021-07-07 02:29:38 +08:00
aismann 76b5bf8038 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 46a3ec8d6b Merge: 2f570e4b64 3c25f74ef1 
Merge pull request #420 from halx99/chipmunk-testbed

Chipmunk testbed adapt non-win platform compile issue
 2021-07-06 20:46:56 +08:00
halx99 83bc1b77d6 Update CHANGELOG 2021-07-06 19:01:35 +08:00
halx99 d65529ea93 Fix case for linux 2021-07-06 18:46:07 +08:00
halx99 46d9f5cbf5 ChipmunkTestBed non-win platform adapte 2021-07-06 18:40:24 +08:00
halx99 7e1dd57605 HttpClientTest tag [skip ci] 2021-07-06 11:43:57 +08:00
halx99 0c74a94525 Implement HttpClient::sendSync with std::promise 2021-07-06 11:39:53 +08:00
halx99 3df92d56de HttpClient handle content type from custom headers 2021-07-05 14:24:04 +08:00
halx99 43f25d5ad7 Downloader background task [ci build] 2021-07-04 19:26:18 +08:00
halx99 97425dc655 Fix #413 2021-07-04 16:40:34 +08:00
halx99 3436c968e2 Remove yasio test since we implement HttpClient based on it [ci build] 2021-07-02 19:02:38 +08:00
aismann c6bff19863 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 ad9b41d49c Update ChipmunkTestBed.h (#412) 2021-06-30 17:13:55 +08:00
aismann 9e997a4a52 Improve Chipmunk2D - TestBed (#404) 2021-06-30 09:52:54 +08:00
aismann 2f9d7c5d3f 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 86322ba427 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 8577d6f81a Improve Chipmunk2D - TestBed, add same more debug draw stuff and some fixes too. 2021-06-25 17:01:23 +08:00
halx99 72d1ba9ea6 Merge: df58dd753c 2397d54daf 
Merge branch 'dev' into Chipmunk2D
 2021-06-24 17:04:04 +08:00
aismann dbcb5816fe Add springs (draw), add Copyright, improve Chipmunk2d - Testbed 2021-06-24 09:54:02 +02:00
halx99 569b8c5c30 Fix ci [ci build] 2021-06-24 12:48:25 +08:00
halx99 14dc7f05f9 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 36d258f589 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 de2450d3dd Fix #392 2021-06-24 01:23:29 +08:00
aismann 289f2b0552 Update CMakeLists.txt 2021-06-24 00:21:36 +08:00
aismann fcf23d58cd Improve Chipmunk2D - TestBed, some more examples, keyboard support, display rearange 2021-06-24 00:21:36 +08:00
halx99 510cf21197 Tidy thirdparty [ci build] 2021-06-24 00:04:29 +08:00
aismann 6a0120644c Update CMakeLists.txt 2021-06-23 17:32:34 +02:00
aismann 5f96756d6d Improve Chipmunk2D - TestBed, some more examples, keyboard support, display rearange 2021-06-23 17:09:48 +02:00
aismann ea615e231c 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 d7b13b36d7 Chipmunk2D - TestBed Add more examples and improve using the original source 2021-06-18 16:52:56 +08:00
halx99 cbb1df02c4 Improve Lua RTTI performance [ci build] 2021-06-18 12:23:10 +08:00
aismann bd10049c23 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 a8f7a7d7c1 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 4ec57546f5 Update yasio [ci build] 2021-06-14 22:54:50 +08:00
halx99 3a7d79733f Update readme guide and fixup [ci build] 2021-06-08 21:53:18 +08:00
halx99 5a6045ab19 Make gradle utils file as shared [ci build] 2021-06-02 06:27:19 +08:00
halx99 dc11adb950 [Gradle] Find ndk with env ANDROID_NDK [ci build] 2021-06-02 05:37:18 +08:00
halx99 84a8ec8e2e Fix lua build [ci build] 2021-05-24 19:18:15 +08:00
halx99 25b88ff40b Fix ci [ci build] 2021-05-24 17:20:28 +08:00
halx99 827d384eef Renaming refactor (#353) [ci build] 2021-05-18 16:40:30 +08:00
halx99 93173d860b Replace jcenter with mavenCentral [ci build] 2021-05-15 12:15:38 +08:00
halx99 e367689ca9 Gradle Plugin no longer support cmake 3.10.0+ 2021-05-15 11:58:56 +08:00
halx99 4a12425a1b Fix android ci [ci build] 2021-05-15 00:12:41 +08:00
halx99 b68f7b8948 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 8e6faac1f1 Merge: 3348f10813 3a7bb58045 
Merge pull request #350 from rh101/fix-cmake-set-property

Fix for CMake error when set_property is called with aliased target
 2021-05-05 19:49:30 +08:00
rh101 c3618f8ea6 Extract real target from ALIAS if it exists in order to set property successfully 
Remove duplicate entries in dependencies lists
 2021-05-05 16:04:06 +10:00
halx99 fdf0ebc97f Make tests could build at external location [ci build] 2021-05-02 17:23:39 +08:00
halx99 0511520281 Merge: 7f1ca55a97 1efe0091a8 
Merge pull request #347 from rh101/imgui-fix

ImGUI font crash fix when using virtual file system
 2021-04-27 23:29:22 -07:00
rh101 e5fa398c67 Load fonts into IMGUI using memory routines rather than allowing it to use its own file handling in order to support FileStream related implementations. 2021-04-28 15:53:37 +10:00
halx99 72fa15f8f3 Fix cpp-tests exit crash when tableView in scrolling [ci build] 2021-04-26 17:55:55 +08:00
rh101 95cf5b5c2b Merge: 2aa2d69151 b7506fed0c 
Merge branch 'vfs-support' of https://github.com/rh101/engine-x into vfs-support
 2021-04-23 00:01:47 +10:00
rh101 54ffa13dff Move PosixFileStream class to its own files 
Update UserDefault to work with FileStream
Fix undefined openFileStream on platforms other than Win32
 2021-04-23 00:01:32 +10:00
RH 1e15ed4839 Merge: 2cef9f2e76 844119d162 
Merge pull request #3 from c4games/master

Sync with master
 2021-04-22 21:48:49 +10:00
rh101 7540c06fd3 Use FileStream to write JPG images to disk 2021-04-22 21:36:26 +10:00
halx99 8ed6d34234 Explicit set cmake minimum version at app/build.gradle [ci build] 2021-04-22 11:40:53 +08:00
rh101 2bf12b2226 Add support for virtual file system via custom FileStream and FileUtils implementations. 2021-04-22 03:15:49 +10:00
halx99 473e51cee7 Set cmake min version to 3.10 [ci build] 2021-04-21 14:05:44 +08:00
halx99 c2596efd04 Ensure build native first before compile java code 2021-04-20 20:25:32 +08:00
halx99 1c2daaf4ae Set gradle-wrapper to 6.8.3 [ci build] 2021-04-08 22:42:15 +08:00
halx99 2a10e85122 fix lua-tests cmake script 2021-03-26 17:10:37 +08:00
halx99 5488a8da20 Fix CMakeLists for separating test projects [ci build] 2021-03-15 09:50:32 +08:00
halx99 6904b9f3f3 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
halx99 9cb8963ca3 Merge: aded15aac7 057642921b 
Merge pull request #311 from aismann/master

Update controller.cpp
 2020-12-21 22:19:29 +08:00
halx99 984c164c57 Sync yasio to 3.35.0 [ci build] 2020-12-21 18:12:13 +08:00
aismann f38b271650 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 0fab6141b6 same/correct wording style 2020-12-03 21:33:52 +01:00
halx99 04db04ad93 Merge: 3f4178cc27 dbf81d7511 
Merge pull request #295 from aismann/master

CCPhysicsSprite(Box2D/Chipmunk2D) cleanup, some other small improvements...
 2020-12-02 08:39:58 -08:00
halx99 8b9d5db029 Unify CC_COMPAT_GL to control renderer backend 
win32: google angle
mac: NSGL
ios: GLES
 2020-12-02 03:03:05 -08:00
aismann fd70034958 Removed CC_ENABLE_CHIPMUNK_INTEGRATION from class CCPhysicsDebugNode 
CCPhysicsDebugNode.cpp has only the Chipmunk2D implementation
 2020-12-01 17:58:34 +01:00
aismann 73b2b175d9 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
halx99 43f5a305c8 Merge: 079ecdbbec 5e249bf6f8 
Merge pull request #293 from aismann/master

Chipmunk2D and Box2D works together now (add two new classes) and FIX  ImGuiEXTTest window size problem
 2020-12-01 01:52:47 -08:00
aismann 18cc4a9eb4 Update README.md 
change wiki link:  https://github.com/c4games/engine-x-wiki
 2020-12-01 10:32:09 +01:00
aismann 91843b3fae 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 b51545ac54 Same as on 3.17 (with small changes) 2020-11-23 07:46:09 +01:00
Eismann e08b35755b Update Box2dTest.h 2020-11-20 07:05:21 +01:00
Eismann d126affebf Update CMakeLists.txt 2020-11-20 06:38:09 +01:00
Eismann 232fea1442 add Box2D to CMakeList 2020-11-20 06:19:30 +01:00
Eismann 7179435c80 Add BOX2D test 
Add BOX2D test
 2020-11-20 04:51:47 +01:00
halx99 a976e217c1 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 db2e468e91 CMake, use file TO_CMAKE_PATH instead string replace [ci build] 2020-11-12 22:47:35 +08:00
halx99 c98313ac4b Prepre for box2d-2.4.1 2020-11-08 13:11:40 +08:00
halx99 3835174a45 Sync folder for binding generator config 2020-11-01 20:18:50 +08:00