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

185 Commits

Author SHA1 Message Date
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 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
halx99 f55c974d18 Build android arch arm64-v8a only for ci, fix test case compiling warning 2020-10-26 11:12:55 +08:00
halx99 534b2acc39 Lock name 2020-10-24 21:57:36 +08:00
halx99 0830fe9c14 Only needs updateUniformID when set a unstable uniform variable 2020-10-23 15:07:18 +08:00
halx99 119479b060 Refine ProgramState mat id 2020-10-23 11:37:52 +08:00
halx99 cff35a61b8 Set CMAKE_XCODE_ATTRIBUTE_IPHONEOS_DEPLOYMENT_TARGET at toolchain file ios.mini.cmake 2020-10-22 17:50:25 +08:00
halx99 253b82c617 Make setup.py works with python3 2020-10-22 16:53:28 +08:00
halx99 b8a0e0a478 Finsih rename 2020-10-22 10:58:10 +08:00
halx99 2e7546eca4 Update gradle plugin to 4.1.0 2020-10-21 10:55:32 +08:00
halx99 5748bbee85 Reserve extensions 'cocostudio' for esay to migrate exist projects 2020-10-21 10:12:00 +08:00
halx99 8152e6d8ad cpp-tests for mobile, set resourceSize to 960x640 2020-10-20 16:38:50 +08:00
halx99 9e6b360437 fix lua build link on android 2020-10-19 23:21:40 +08:00
halx99 4c128913c1 Sync SharedLoader template. 2020-10-19 19:19:17 +08:00
halx99 5dc2626894 Reserve extension GUI for cpp-tests only 2020-10-18 12:31:45 +08:00
halx99 9019cb0d0f Use system env var 'COCOS2DX_ROOT' to avoid copy whole engine sources when create new project with template 2020-10-18 01:05:36 +08:00
halx99 d02c9da98b Use system env var 'COCOS2DX_ROOT' to avoid copy whole engine sources when create new project with template 2020-10-18 01:01:36 +08:00
halx99 b9c58a8420 Refactor modules (#238) 2020-10-17 16:32:16 +08:00
halx99 5401bbf821 Simplfy hsv color 2020-10-16 17:23:29 +08:00
halx99 c594e3789c Refactor programState management (#236) 
1. Add custom program registery
2. Re-enable batch draw for custom program
 2020-10-16 16:23:14 +08:00
halx99 cca0739793 Refactor pixel format manipulate (#217) 
* PixelFormat use table

* Correct PixelFormat name to match 'GL_LUMINANCE'

* Up

* fix cube update texture enum

* linux build

* Refine ci

* fix linux build

* Remove unused function, match mtl framebuffer pixel format

* readPixels always RGBA format

* fix ci for linux

* fix linux build

* Remove unused functions

* fix travis

* fix android ci

* Update config.json

* linux glad

* Update CCGLViewImpl-desktop.cpp

* fix linux build

* Fix linux build

* Link issue [skip appveyor][skip travis]

* Update CMakeLists.txt

* Refine GL enums use

* Update test case name [skip appveyor][skip travis]

* fix linux link issue

* for mtl

* fix ci

* Tidy pixelformat enums

* fix ci

* fix rgba8 to abgr4 error

* fix ci

* fix ci for GLES

* Fix linux build, require glibc-2.27+

* Use properly dist for travis [skip appveyor]

* fix linux build [skip appveyor]

* Update install-deps-linux.sh

* Remove unused members for pixel block info, update external to v73

* Sync from compile linux warnings

* Remove unused check, and PixelFormat::A8 is ordinary format, not compressed format

* metal doesn't support rgb8 (#3)

* Update CCTexture2D.cpp

* Refine code

* Pixel Format Descriptor Table

* fix ci

* BGR5A1

* Simplfy texture format convert function name

* Update

* rgba4 match mtl render format

* Add note about RGBA4

* Remove unused function

* fix osx

* Already converted at texture2d

* Clearly comment

* fixup
 2020-09-25 11:07:56 +08:00
halx99 ac2e8e4bb6 fix ci 2020-09-17 12:10:08 +08:00
halx99 c0a61434e0 Sync pr from https://github.com/cocos2d/cocos2d-x/pull/20580 2020-09-17 12:05:31 +08:00
halx99 1f30e31b17 Add Label crashing test case for https://github.com/cocos2d/cocos2d-x/issues/20523 2020-09-17 11:49:47 +08:00
halx99 f2e7955724 fix warn [skip appveyor] 2020-09-11 18:46:15 +08:00
halx99 4fc03985d3 Use glMapBuffer if available 2020-09-11 17:32:08 +08:00
halx99 6c2939d235 More clearly programState management 2020-09-09 13:03:31 +08:00
halx99 08ee67158a fix ident [skip appveyor] [skip travis] 2020-09-08 17:23:15 +08:00
halx99 7f6b6dfa90 Update CMake scripts and readme 2020-09-08 13:44:59 +08:00
halx99 ddbb6bb0b9 Add ImGuiEXT test case for PC platforms 2020-09-08 13:38:16 +08:00
halx99 d66e62e436 ASTC6x6 support and more comment about bpp usage in engine (#191) 
* ASTC6x6 support and more comment abount bpp usage in engine

* fix log output

* Comment astc compression tool download url

* Add command line comment for astcenc tool [skip travis][skip appveyor]

* Add astc_6x6 test image[skip appveyor][skip travis]

* astc_6x6 mtl

* Refine log info[skip appveyor][skip travis]

* Empty line[skip appveyor][skip travis]
 2020-09-03 18:01:40 +08:00
halx99 cc53868d27 More clearly ETC1 format, sync enums for ETC1, correct somethings 2020-09-01 11:43:03 +08:00
halx99 09cedf60b2 Improve images decoder 2020-08-31 21:04:47 +08:00
halx99 e96ae229dd Merge: 5ddc84bbee 539e5ca42c 
Merge pull request #189 from aismann/patch-8

Update README.md
 2020-08-31 04:27:33 -07:00
halx99 a87c0bba78 More clearly data owner when decode images. 2020-08-31 19:24:23 +08:00
halx99 fa5d2d198b fix resources relative path to avoid test case crash on mobile 2020-08-31 17:39:29 +08:00
halx99 c338472df8 Move copyright notice to header [skip appveyor][skip travis] 2020-08-31 17:35:01 +08:00
halx99 477aa0c185 Clearly CCLOG content 2020-08-31 17:13:04 +08:00
halx99 43f464163c 1. Finish ETC2 support on GL renderer backend 
2. Improve ASTC compressed format check
 2020-08-30 17:58:39 +08:00
halx99 2197bb52cd Sync missing feature from v3, and API compatible 2020-08-28 16:33:52 +08:00
halx99 4674b1e89d Remove TMXLayer,TMXMap, remain FastTMXLayer,FastTMXMap enough 2020-08-28 15:42:40 +08:00
halx99 9eb32b634f Make core lib can be build as dll, fix link issue for external 2020-08-18 12:36:44 +08:00
halx99 a3a231495c Backport CCValue APIs 2020-08-18 11:33:18 +08:00
halx99 f0276f37ae Update README files [skip appveyor] [skip travis] 2020-08-17 19:09:54 +08:00
halx99 d084d9f61a Improve shared library for android, remove mojoal,sdl2, still use OpenAL.framework on apple platform, alsoft on other platforms. 2020-08-17 18:45:14 +08:00
halx99 b456364167 Sets Gradle Plugin version to 3.4.0 to fix cmake can't recognize ninja 2020-08-10 15:04:12 +08:00
halx99 d179f7916f Remove unnecessary code 2020-08-10 00:21:56 +08:00
halx99 0d357b57f8 Optimize YAsioTest, see #150 2020-08-10 00:20:29 +08:00
aismann 6cd61aac2f Polygon looks correct now 
Tested with Clipper 6.x and new poly2tri
 2020-08-08 09:57:17 +02:00
halx99 ec80ebd344 Optimize CMake scripts 2020-08-04 14:05:00 +08:00
halx99 8b9a6bbbf1 fix android build issues 2020-08-03 20:31:47 +08:00
halx99 1e392c9dfe Refine readme [skip appveyor][skip travis] 2020-08-03 19:12:07 +08:00
halx99 3049b8f751 Huge changes, move spine,dragonbones,cocostudio to extensions folder, future make all extensions pluginable 2020-08-03 17:51:40 +08:00
aismann 400c34fffb The switch to the third monitor was not working 2020-08-03 08:34:19 +02:00
halx99 588e977ef0 Merge: 8cc189fb4d 6fd4d6e4ab 
Merge pull request #134 from halx99/fullscreen-mode

Refactor full screen support
 2020-08-02 20:03:07 -07:00
halx99 d6958498d4 Unify plist implementation, remove apple specific sources. 2020-08-03 10:48:26 +08:00
halx99 839922bbfe Set full screen before layout renderer elements to ensure VisibleRect is correct with full screen window size 2020-08-02 16:55:21 +08:00
halx99 bd9a409dd7 Add wav testcase 2020-08-01 19:25:39 +08:00
Eismann 5edcd0b97d Add tests for Fullscreen Monitor 3 
Add tests for Fullscreen Monitor 3 (if present)
 2020-08-01 07:12:29 +02:00
Eismann ba0e91f7e3 Revert "Revert "Update NewAudioEngineTest.cpp"" 
This reverts commit 379c099b2d.
 2020-08-01 06:55:33 +02:00
Eismann 4c36d9477a Revert "Update NewAudioEngineTest.cpp" 
This reverts commit 87232d61b1.
 2020-08-01 06:54:56 +02:00
Eismann 34b3f1589e Update NewAudioEngineTest.cpp 
"wav-samples/8kadpcm.wav" not existing.
 2020-08-01 06:49:44 +02:00
halx99 c71642b14f Optimize link, remove -Wl,--whole-archive for linking 3rd libs. 2020-07-29 18:55:45 +08:00
halx99 f98bcff3a6 Copy angle binaries 2020-07-23 10:32:50 +08:00
halx99 690e89b00e Remove a submodules. 2020-07-20 18:41:45 +08:00
halx99 16a0fd73c3 Merge: db0ed5bd59 a3a65b0320 
Merge pull request #109 from halx99/win-utf8

Improve utf-8 path on win32, explicit call wide version of system API.
 2020-07-10 16:56:18 +08:00
halx99 e9fa3b4dac Merge: 7624df74f3 d20d3fd241 
Merge pull request #111 from halx99/fix-type-error

fix type error, well xxhash never generate 0 for validate draw command.
 2020-07-10 16:42:57 +08:00
halx99 67ab691c30 fix compile issue 2020-07-10 16:00:21 +08:00
halx99 489fb1a50a finish angle dependencies auto copy for win32, make flatbuffers dep header only 2020-06-14 12:50:20 +08:00
halx99 04a460705d finish issue: #85 2020-05-06 15:42:25 +08:00
halx99 b30af83018 Remove unused Android.mk files 2020-03-04 22:59:33 +08:00
halx99 ecd988d324 Update deps to v33 2020-03-03 23:17:38 +08:00
halx99 52058861a0 Refactor CCValue. 2020-03-03 19:24:07 +08:00
halx99 41f0869926 Merge: 2d3e162e21 5d7f58c3ad 
Merge pull request #50 from weiwest/master

add astc support (Great Job)
 2020-02-12 20:24:29 +08:00