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

395 Commits

Author SHA1 Message Date
Deal 969baf94d4 Update CHANGELOG [skip ci] 2023-08-09 13:52:28 +08:00
halx99 802a56eb4e Update lua bindings 2023-08-04 11:03:39 +08:00
halx99 805b115719 Update lua bindings 2023-07-29 21:30:35 +08:00
halx99 94b5705bd3 Improve cmake script 
- glslcc helper function
- Rename ax_add_shader to ax_target_compile_shaders
- Provide argument FILES for specify single or multi shader
source files support, i.e.
ax_target_compile_shaders(target_name FILES 1.frag 1.vert)
- Rename all _AX_ROOT_PATH to _AX_ROOT
 2023-07-06 19:21:36 +08:00
halx99 0f8c198bbd Sync lua-bindings 2023-07-05 20:22:44 +08:00
halx99 3eac3abecf Sync yasio to latest 2023-06-24 21:18:27 +08:00
Deal(涓€绾跨伒) feffe4095c Update 3rd sources (#1240) 
- llhttp: 8.1.1
- yasio: latest
- recast 1.6.0
- openal-soft: latest for official UWP support
- glad 2.0.4
- libpng 1.6.40
- astcenc 4.5.0
- Add fastlz: latest
- Disable lz4 by default
 2023-06-24 09:17:14 +08:00
halx99 2d81db7869 Fix lua bindings 2023-06-11 15:07:31 +08:00
Deal(涓€绾跨伒) abd8029f64 Remove CC prefix from code file name (#1230) 
* Add migrate sources tool

* Fix include replace regex

* Fix compile

* Migrate maually

* Disable sources-migrate tool by default

* Fix ci

* Fix ci

* Improve source migrate

* Fix ios/tvos ci

* Fix ios/tvos ci

* Fix
 2023-06-11 13:08:08 +08:00
Deal(涓€绾跨伒) bc82034ffd Improve media-engine for android, linux (#1228) 
* Improve media-engine
- Implement andorid,linux
- Improve local file uri scheme

* Fix ci

* Improve code style

* Improve

* Update VlcMediaEngine.cpp

* Update AvfMediaEngine.h

* Fix ci

* Improve code style

* Enable androidx gradle.properties [skip ci]

* Improve code style

* Remove unnecessary callbacks

* Rename VideoPlayer to MediaPlayer
 2023-06-10 22:05:49 +08:00
halx99 5e9415e09c Committing genbindings changes 2023-06-05 09:19:09 +00:00
halx99 4899f00893 Committing genbindings changes 2023-05-31 12:31:31 +00:00
halx99 5511af4a47 Committing genbindings changes 2023-05-23 11:54:13 +00:00
halx99 50b9249e28 Update yasio to latest 2023-05-14 22:39:05 +08:00
RH 8f56fd9e3c Update LUA constants for target platform (#1192) 2023-04-28 14:55:27 +08:00
halx99 43a2bbf2fc Committing genbindings changes 2023-04-05 08:27:15 +00:00
halx99 8f2a4a22ef Improve code style 2023-04-05 11:06:25 +08:00
halx99 56d0851c69 Committing genbindings changes 2023-04-02 01:37:22 +00:00
halx99 8469c86eb6 Fix lua binding 2023-04-02 09:29:12 +08:00
Deal(涓€绾跨伒) 1e6e9d4a8d Media engine video texture (#1133) 
* VideoPlayer based on new MediaEngine[Win32/UWP]

* Improve MediaEngine interface

* Update readme

* Improve pixel format

* Improve MediaEngine interface

* Ready for PR UWP/Win32

* Ready for PR UWP,Win32

* Update reademe files

* Update readme files

* Update UIVideoPlayer-android.cpp [skip ci]

* Update UIVideoPlayer-ios.mm

* Update MFUtils.cpp

* Fix ci
 2023-03-25 08:37:51 +08:00
halx99 32c32bf98a Committing genbindings changes 2023-03-14 00:03:28 +00:00
aismann 213afaefa7 add axmol_ext.h (#1117) 2023-03-14 07:56:07 +08:00
halx99 48d45fe0f1 Committing genbindings changes 2023-03-11 15:01:39 +00:00
Deal(涓€绾跨伒) 277bcd44ce Windows Store UWP apps support (#1108) 
* [BIG FEATURE] Windows Store UWP apps support

* Fix ci, add uwp for pr-ci

* Fix ci

* Improve ci script

* Fix ci

* Fix ci

* Fix ci

* Fix ci

* Upload uwp appx package artifacts [skip ci]

* Use d2d draw system font text

* Fix ci

* Improve code style
 2023-03-11 22:10:18 +08:00
halx99 a9f2e03c18 Committing genbindings changes 2023-03-07 15:34:03 +00:00
tkzcfc b4b25b3edd fix: type judgment error (#1084) 
* fix: type judgment error

---------

Co-authored-by: tkzcfc <tkzcfc@users.noreply.github.com>
Co-authored-by: 涓€绾跨伒|Deal <halx99@live.com>
Co-authored-by: HYGK-PC\Administrator <tkzc@foxmail.com>
 2023-02-27 19:12:21 +08:00
halx99 b8528b920a Committing genbindings changes 2023-02-14 15:38:16 +00:00
solan-solan 7378af1e88 GL_RGBA32F GL backend support (#1034) 
* Added GL_RGBA32F_EXT for GL backend to support floating point textures.

* Committing genbindings changes

* Added fp texture constant to mtl.

Co-authored-by: solan-solan <solan-solan@users.noreply.github.com>
 2023-01-19 22:10:41 +08:00
halx99 32740c2d58 Remove unused from cmake script 2023-01-17 10:08:09 +08:00
halx99 9ce1d9a3e7 Committing genbindings changes 2023-01-06 15:48:02 +00:00
涓€绾跨伒|Deal 4108bdd048 Fix ci 2023-01-05 02:47:23 +08:00
halx99 98efcfe193 Update yasio to latest 2023-01-04 23:20:07 +08:00
halx99 bb01a66859 Merge: b164698459 6f08abab88 
Merge branch 'dev' of https://github.com/axmolengine/axmol into dev
 2023-01-04 23:06:18 +08:00
halx99 aeedf0daee Improve posix macro definations 2023-01-04 23:05:52 +08:00
halx99 46e33bb548 Committing genbindings changes 2023-01-04 14:59:56 +00:00
halx99 3f9cbc3c16 Committing genbindings changes 2023-01-01 10:21:43 +00:00
halx99 ff419dfc47 Committing genbindings changes 2022-12-29 09:01:26 +00:00
tkzcfc 8cd1e6f114 Fix download task creation failure Program crash (#984) 
* Support return type'ResourceData'

* Revert "Support return type'ResourceData'"

This reverts commit dd38d06350.

* Support return type'ResourceData'

* Support binary files

* Support Lua to call cc.utils: capturenode

* Support Lua to call cc.utils: capturenode

* export: sp.SkeletonAnimation:findBone sp.SkeletonAnimation:getBoundingBox

* export 'setAttachment' function to lua

* Committing genbindings changes

* search path adding repeated judgment

* add macro definition  AX_NO_DUP_SEARCH_PATH

* add macro definition  AX_NO_DUP_SEARCH_PATH

* Update core/platform/CCFileUtils.cpp

* Fix downloader crash in the lua coroutine

* fix download task creation failure Program crash

Co-authored-by: tkzcfc <tkzcfc@users.noreply.github.com>
Co-authored-by: 涓€绾跨伒|Deal <halx99@live.com>
Co-authored-by: HYGK-PC\Administrator <tkzc@foxmail.com>
 2022-12-12 20:56:48 +08:00
halx99 2fade7328a Committing genbindings changes 2022-12-07 01:31:10 +00:00
halx99 bb333ed92f Committing genbindings changes 2022-11-28 00:44:15 +00:00
涓€绾跨伒|Deal b01d58a466 Update init.lua 2022-11-12 20:34:48 +08:00
halx99 f11daa7347 Committing genbindings changes 2022-11-07 08:04:54 +00:00
halx99 f00174bfcc Committing genbindings changes 2022-11-01 04:19:28 +00:00
halx99 33599119ae Committing genbindings changes 2022-11-01 01:34:53 +00:00
halx99 0749378bc8 Committing genbindings changes 2022-10-31 22:56:01 +00:00
涓€绾跨伒|Deal 6ddd6f0e05 Update CMakeLists.txt 2022-11-01 06:47:36 +08:00
halx99 a87bf2ee4b Fix effekseer compiling [skip ci] 2022-10-31 14:30:33 +08:00
halx99 56d66aba67 Remove FileUtils::searchResolutionsOrderArray 2022-10-30 23:03:39 +08:00
halx99 54ef53f939 Committing genbindings changes 2022-10-20 12:52:19 +00:00
tkzcfc 8a2f5d6666 Fix downloader crash in the lua coroutine (#927) 2022-10-18 17:42:19 +08:00
halx99 8f9e610713 Committing genbindings changes 2022-10-13 14:08:14 +00:00
halx99 567069236b Luabinding: Add std:🧵:id support 2022-10-12 14:22:45 +08:00
halx99 496962f762 Committing genbindings changes 2022-10-11 23:33:16 +00:00
halx99 95d3fcb16a Migrate lua scripts, remove deprecated files 2022-10-07 21:24:11 +08:00
halx99 7343c969fa Committing genbindings changes 2022-10-04 03:15:52 +00:00
涓€绾跨伒|Deal 48a7da97d6 Final migrate (#876) 2022-10-01 16:24:52 +08:00
tkzcfc 5f8b96d607 export 'setAttachment' function to lua (#868) 
* export: sp.SkeletonAnimation:findBone sp.SkeletonAnimation:getBoundingBox

* export 'setAttachment' function to lua

Co-authored-by: tkzcfc <tkzcfc@users.noreply.github.com>
 2022-09-27 19:15:11 +08:00
halx99 b087ac671f Committing genbindings changes 2022-09-26 16:13:15 +00:00
halx99 ad69ed003a Remove unnecessary APIs 2022-09-26 23:20:54 +08:00
halx99 c4b11658cd Committing genbindings changes 2022-09-24 04:39:58 +00:00
halx99 3a9a26c743 Fix #861 2022-09-23 22:41:30 +08:00
tkzcfc b051164bf2 Support Lua to call cc.utils: capturenode (#848) 2022-09-06 21:23:44 +08:00
涓€绾跨伒|Deal e37761260a Migrate, use simple namespace ax (#818) 2022-08-29 20:51:22 +08:00
涓€绾跨伒 c6fc93abbc Update README.md 2022-08-18 09:13:09 +08:00
unknown 9a9025aede Add empty check 2022-08-16 15:12:45 +05:30
halx99 6d5e50ded9 Avoid unnecessary double lookup 2022-08-16 17:14:06 +08:00
unknown 9968a7ddcb Add support for width & height in percentage for RichElementImage 2022-08-16 12:09:02 +05:30
halx99 87f71ba3a9 Migrte lua script files 2022-08-15 16:28:32 +08:00
halx99 b1287b8cc5 Migrate cmake files 2022-08-11 15:41:10 +08:00
halx99 729916c58f Committing genbindings changes 2022-08-11 03:03:29 +00:00
halx99 e3799aec91 Committing genbindings changes 2022-08-11 01:57:48 +00:00
aismann 8139894edd replace push_back() vs emplace_back() on extension (#785) 2022-08-09 09:54:53 +08:00
涓€绾跨伒 9892aa3d1c Migrate axys (#782) 2022-08-08 18:02:17 +08:00
halx99 ddc7d8ccd0 Merge: f40c44755f 7a7c8fe2ae 
Merge branch 'dev' of https://github.com/axis-project/axis into dev
 2022-08-06 22:03:14 +08:00
halx99 714d814288 Improve android setup tools 
- Rename ANDROID_SDK to ANDROID_SDK_ROOT, refer to: https://developer.android.google.cn/studio/command-line/variables
- CMake: Use ndk in sdk_root/ndk/xxx/
 2022-08-06 22:02:58 +08:00
halx99 64ec0587a5 Committing genbindings changes 2022-08-06 12:11:55 +00:00
Turky Mohammed 818eb3d754 [PROPOSAL] Add wireframe rendering and function classification improvements. (#778) 
* Add wireframe rendering and function classification improvements.

* Fix platform compilation.

* Update CommandBufferGL.cpp

GL_LINE and GL_FILL are no present in mobile devices, so the raw value has been used instead.

* Update CommandBufferGL.cpp

* Try fix IOS compilation

* Update CommandBufferMTL.h [skip ci]

* GLES & D3D11 wireframe

Added crude but okay wireframe mode for GLES and D3D11 devices.
 2022-08-06 16:17:55 +08:00
halx99 ca3c6fe1fd Fix #776 2022-08-04 21:05:48 +08:00
tkzcfc 8e6d06e9fe Support spine binary files (#777) 2022-08-04 20:11:11 +08:00
halx99 752c4d1d16 Committing genbindings changes 2022-08-02 00:29:11 +00:00
tkzcfc 839097ed95 [Lua Binding] Support return type 'ResourceData' (#763) 2022-07-22 13:13:22 +08:00
halx99 07906b96e1 Fix #758 2022-07-20 18:41:33 +08:00
halx99 c4feff6e3a Committing genbindings changes 2022-07-20 00:57:28 +00:00
halx99 57a65dc8ce Committing genbindings changes 2022-07-19 10:58:12 +00:00
halx99 2c6fde019b Migrate macro COCOS2D_DEBUG, refer #751 2022-07-19 15:34:26 +08:00
涓€绾跨伒 a5e442b33c Merge: 2e0ac94240 4974d1181c 
Merge pull request #750 from axis-project/migrate-macros

Migrate macros 'CC_' to 'AX_'
 2022-07-16 12:45:47 +08:00
halx99 e90579ed96 Sync platform macros [skip ci] 2022-07-16 10:53:30 +08:00
halx99 c16a33e347 Migrate more macors 2022-07-16 10:43:05 +08:00
涓€绾跨伒 ac1872494c Remove unnecessary check [skip ci] 
refer to #748
 2022-07-15 19:44:31 +08:00
halx99 41d2c44308 Migrate macros 'CC_' to 'AX_' 2022-07-15 19:17:01 +08:00
halx99 11be5350f9 Fix lua templte 2022-07-12 23:21:04 +08:00
涓€绾跨伒 b7467da607 Migrate extension lua (#747) 2022-07-12 21:31:54 +08:00
涓€绾跨伒 bf77f46dce Migrate engine namespace to `axis`(abbv: `ax`) (#743) 2022-07-11 17:50:21 +08:00
涓€绾跨伒 9b4a7b1446 Merge: 04ca16125b 9ee4181976 
Merge pull request #739 from axis-project/migrate-engine-test-extension-config

Migrate tests, extensions and configs
 2022-07-10 09:47:41 +08:00
涓€绾跨伒 d4c4d395a5 Merge: 18076d09f0 2f8d5dd2f6 
Merge pull request #738 from solan-solan/index_array_to_stl

IndexArray to stl
 2022-07-10 09:47:27 +08:00
halx99 c2acb3a744 Migrate tests, extensions and configs ReSquash for unexpected changes +2 2022-07-09 22:23:34 +08:00
DelinWorks 765d3f5332 Replace CC_ with AX_ 2022-07-08 02:17:41 +03:00
DelinWorks 70cd6095cc Fix CMAKE 2022-07-08 02:10:35 +03:00
halx99 e1757a275f Merge: 3a070cd801 9d2ed962e6 
Merge branch 'dev' of https://github.com/adxeproject/adxe into dev
 2022-07-05 15:53:50 +08:00
halx99 6aaff5cda8 Delete *.obj to avoid missing 3d model .obj 
a. build_xxx, out_xxx in .gitignore is enough ignore code .obj
 2022-07-05 15:53:33 +08:00
halx99 36caefd1d0 Committing genbindings changes 2022-07-05 07:53:11 +00:00
Turky Mohammed 656babac78 [IMPROVMENT] Change class name `Sprite3D` to `MeshRenderer` (#705) 
* First draft [skip ci]

* Improve comments [skip ci]

* Rename MeshRendererMaterial to MeshMaterial [skip ci]

* Update dependent classes.

* Replace occurrences of Sprite3D with MeshRenderer.

* Update cpp-tests and extensions.

* Fix compilation.

* Try fixing lua-bindings

* Try fixing lua-bindings

* Update lua_cocos2dx_3d_manual.cpp [skip ci]

* Create RENAMED_TYPES.md
 2022-07-05 14:48:46 +08:00
halx99 ba582903fc Spine runtime can use official code 2022-07-05 14:13:15 +08:00
DelinWorks d50d34ea3b Separate renderer enums to their own file. 2022-07-04 19:52:17 +03:00
halx99 9af6fc8c88 Committing genbindings changes 2022-07-04 16:47:16 +00:00
涓€绾跨伒 e6ae7c44b3 Merge: 555f847c1f 6dd8b2c74a 
Merge pull request #702 from DelinWorks/improve-engine-types

[PROPOSAL] Move global enums to their own file.
 2022-07-05 00:39:20 +08:00
DelinWorks 96158090db Add stride functions and remove unneeded UNSPEC value. 2022-07-04 19:20:04 +03:00
DelinWorks 7e199cce21 Update lua_cocos2dx_auto.cpp 2022-07-04 18:34:50 +03:00
halx99 a31ba3caae Improve meshdata load 
- Avoid GC alloc when store indices
- Fix indices iterator by IndexArray::for_each
 2022-07-04 23:23:33 +08:00
DelinWorks 49508bd13c Improve function naming. 2022-07-04 17:45:23 +03:00
halx99 0b4363bfc0 Refator sampler name in shader 2022-07-04 21:26:48 +08:00
DelinWorks a8d704babe Improve function naming and add descriptions. 2022-07-04 05:55:29 +03:00
DelinWorks 6a7a77c604 Update CCDirector.h 2022-07-04 04:58:13 +03:00
halx99 38743291e2 Improve class IndexArray 2022-07-04 09:13:06 +08:00
DelinWorks c97042be2e Fix android arm64 incorrect random number generation. 2022-07-04 03:28:55 +03:00
DelinWorks 35d3df7075 Fix mobile compilation. 
Treat `CC_ENABLE_CACHE_TEXTURE_DATA` portion of code accordingly.
 2022-07-03 22:50:19 +03:00
DelinWorks a4be3feda6 Update lua_cocos2dx_auto.cpp 2022-07-03 21:40:51 +03:00
DelinWorks 0ff762b835 Move global enums to their own file. 2022-07-03 20:43:55 +03:00
halx99 5f4e2c0463 [WIP] Wrapper IndexArray with byte_buffer 2022-07-03 17:24:10 +08:00
halx99 e0e7b2a6c5 Committing genbindings changes 2022-07-03 07:36:16 +00:00
halx99 7ef1ab7eb0 Committing genbindings changes 2022-06-30 13:51:59 +00:00
涓€绾跨伒 6d2bc9bbf2 Revert "Unify frame rate control logical to director mainLoop" 2022-06-30 21:04:00 +08:00
halx99 18f7def462 Committing genbindings changes 2022-06-30 12:22:46 +00:00
halx99 f48be5bf4a Committing genbindings changes 2022-06-28 09:42:02 +00:00
涓€绾跨伒 6d1a2e70e7 Merge: 040a64b920 884a4c3b1d 
Merge pull request #675 from adxeproject/unify-fps-limit

Unify frame rate control logical to director mainLoop
 2022-06-28 17:33:00 +08:00
涓€绾跨伒 8b42852d1f Delete unused comment [skip ci] 2022-06-28 17:14:35 +08:00
halx99 0acbfdb35a Committing genbindings changes 2022-06-28 08:51:45 +00:00
涓€绾跨伒 614397d0f4 Merge: 7f795d7a6c c6c07428bf 
Merge pull request #677 from rh101/rendertarget-fix

Make the render target selectable for RenderTexture
 2022-06-28 16:39:59 +08:00
halx99 f8c036e621 Improve frame rate control precision 2022-06-28 16:33:50 +08:00
rh101 62af2299a6 Allow the selection of a shared or new render target for each instance of RenderTexture 
Add a method to check if the RenderTexture is using a shared render target
 2022-06-28 17:42:33 +10:00
halx99 6d9c4ea327 Fix ci 2022-06-28 14:53:39 +08:00
halx99 7591ed14cd Committing genbindings changes 2022-06-25 07:30:20 +00:00
涓€绾跨伒 0e94f96b8a Merge: 6431cd1256 e4b891e550 
Merge pull request #667 from FireStorm2012/FireStorm2012-patch-1

Fix print log format
 2022-06-24 15:46:45 +08:00
halx99 e6accc2f7e Add extension Live2D support 
Live2D sdk version: 4-r.4, reelase date: 2021/12/09
 2022-06-24 15:18:08 +08:00
FireStorm2012 9de425666b Update lua_xml_http_request.cpp 
print log bugfix
 2022-06-24 15:01:26 +08:00
halx99 52f6bcb989 Committing genbindings changes 2022-06-24 06:28:59 +00:00
halx99 1122db3ec8 Improve code style 2022-06-24 03:09:50 +08:00
halx99 6068b0389e Committing genbindings changes 2022-06-19 17:57:08 +00:00
halx99 4cf6c52cf4 string_view 2022-06-20 01:49:50 +08:00
DelinWorks 2de02067d3 flag camera as Initialized in custom create functions. 2022-06-17 20:41:38 +03:00
涓€绾跨伒 19e96d53c8 Rename is64BitIOSDevice to is64BitMobileDevice 2022-06-17 22:54:52 +08:00
涓€绾跨伒 0c431fddf1 Fix ci 2022-06-17 22:50:29 +08:00
halx99 61956d8dd6 Refine enum `Platform` defination to avoid conflict with system macro 
refer to: #661
 2022-06-17 22:18:26 +08:00
Turky Mohammed 5a0f0f9073 Merge: 101f09d912 820ad21a46 
Merge branch 'adxeproject:dev' into camera-2d-zoom-feature
 2022-06-17 17:16:55 +03:00
DelinWorks fed10a0197 Add comment. [skip ci] 2022-06-17 17:16:39 +03:00
Turky Mohammed 7c1c0a0f56 Merge: 610711a164 990531ecdc 
Merge branch 'adxeproject:dev' into partical-system-animation
 2022-06-16 19:41:56 +03:00
DelinWorks fd4bfb0fd5 Apply orthographic zoom values non-destructively. 2022-06-16 16:41:40 +03:00
halx99 482df4befc Committing genbindings changes 2022-06-16 13:25:34 +00:00
Turky Mohammed 87e4fad96c Merge: a2bea19e1e 3ac444efa6 
Merge branch 'adxeproject:dev' into partical-system-animation
 2022-06-12 17:26:54 +03:00
DelinWorks 237a3ccbad Improve emission shapes workflow. 
`ps->addEmissionShape(ParticleSystem::createConeShape({ -2000, 0 }, 400, 90, 50));` is the new workflow.
 2022-06-11 18:06:43 +03:00