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

234 Commits

Author SHA1 Message Date
halx99 206ecbb703 Cache GLSLCC_OUT_DIR for symlink works 2023-07-16 14:49:32 +08:00
halx99 e957c5ec0a Remove GLSLCC_FLAT_UBOS 
1. because we are researching ubo support for OpenGL
2. metal already support non flat-ubos
 2023-07-16 14:21:46 +08:00
halx99 3ab3249700 Update glslcc to 1.8.1 
Add dual outputs support, this is useful to handle normal map preprocessor
 2023-07-16 14:14:41 +08:00
RH 95f352e0d0 Invert if condition checking for existence of the axmol bin path in the user path env variable (#1275) 
Make list mutable to allow for inserting new path
 2023-07-16 13:51:36 +08:00
halx99 9a384e39f2 Merge: 412e398651 1daf87c768 
Merge branch 'main' into dev
 2023-07-15 22:45:26 +08:00
Deal(涓€绾跨伒) c5a61124c0 Add chat badges [skip ci] 2023-07-15 11:25:48 +08:00
halx99 2b30d8002f Merge: 7afdd4f2c1 e5b197776c 
Merge branch 'main' into dev
 2023-07-15 01:17:32 +08:00
halx99 e34d02eb7d Fix build1k cmake setup 2023-07-15 01:17:15 +08:00
halx99 8e39354e99 Merge: 83a830d011 cfcafd517a 
Merge branch 'main' into dev
 2023-07-15 01:00:31 +08:00
halx99 177c845cc6 Don't setup glslcc and include it in main branch 2023-07-15 00:54:20 +08:00
Deal(涓€绾跨伒) 4867fc8f2e Update pull_request_template.md (#1270) 2023-07-15 00:21:23 +08:00
halx99 42fcb1f86e glslcc workflow: metal init commit 2023-07-14 23:07:47 +08:00
RH 0c17a35fa8 Fix for crash in TextureCache test (#1267) 2023-07-11 21:55:17 +08:00
Deal(涓€绾跨伒) 4307d42452 Fix missing flag `--lang` for metal 2023-07-11 17:06:20 +08:00
halx99 17a3e6408b Re-enable flat-ubos 2023-07-11 15:43:50 +08:00
halx99 5d7a86a1b9 Merge: 89a739a8ea 09a3a950ae 
Merge branch 'dev' into 1.1-dev
 2023-07-10 15:57:00 +08:00
RH ce590c24a0 Fix for crashes in several tests (#1259) 2023-07-09 14:45:41 +08:00
halx99 ed6ec7a32d [GLSLCC] Suppression macro not defined errors 2023-07-09 12:04:58 +08:00
halx99 d0f7334476 Don't flat ubos since it doesn't work 2023-07-09 11:20:29 +08:00
halx99 7a808cd46b Improve AXGLSLCC.cmake 
By default, output compiled shader
to `${CMAKE_BINARY_DIR}/runtime/axslc`,
then link it to `$<TARGET_FILE_DIR::target_name>/axslc`
 2023-07-08 17:17:10 +08:00
halx99 b1e50c43f0 Fix cmake find_package GLX warning for linux 2023-07-08 17:13:30 +08:00
halx99 17ee3e6f69 Don't add .bin for glslcc shader compile output by default 2023-07-07 19:31:46 +08:00
halx99 b21735a9bb [CMake] Add find shader sources function: 
Syntax: ax_find_shaders(dir shader_sources [RECURSE])
examples:
- ax_find_shaders("${CMAKE_CURRENT_LIST_DIR}/core/renderer/shaders" runtime_shader_sources)
- ax_find_shaders("${CMAKE_CURRENT_LIST_DIR}/Source" custom_shader_sources RECURSE)
 2023-07-06 21:15:28 +08:00
halx99 acc47b3281 Bump 1.1.0 2023-07-06 20:37:59 +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 1d82a9592c [CMAKE] Add shader compile function: ax_add_shader [skip ci] 
- ax_add_shader(${FILE}): output compiled shader to ${CMAKE_BINARY_DIR}/runtime/shaders/${SC_LANG}/xxx_fs.bin
- ax_add_shader(${FILE} CUSTOM): output compiled shader to ${CMAKE_BINARY_DIR}/runtime/shaders/${SC_LANG}/xxx_fs.bin
- ax_add_shader(${FILE} CVAR): the shader will compiled to c hex header for embed include by C/C++ use
 2023-07-06 14:08:16 +08:00
halx99 7cb9aac41e Rename option `AX_USE_COMPAT_GL` to `AX_USE_ANGLE` 2023-07-03 20:35:55 +08:00
halx99 0e74de43d6 Fix copy angle dll error 2023-07-03 20:28:55 +08:00
halx99 2f8a4061d7 Fix prebuilt link [skip ci] 2023-07-02 01:08:04 +08:00
halx99 1d5e85be57 Forcing c99 when winsdk < 10.0.22000.0, refer #1246 2023-07-01 21:11:01 +08:00
halx99 604a7cb858 Download optional c-ares 2023-06-28 00:44:29 +08:00
halx99 0342ad3c39 Fix #1238 2023-06-20 20:48:52 +08:00
halx99 bd2eb7b27d Auto download vlc prebuilts if not found system 
- For windows, can easy enable vlc media via `-DAX_ENABLE_VLC_MEDIA=ON`
 2023-06-17 00:26:46 +08:00
halx99 8d1392e3f4 Improve cmake 2023-06-13 20:30:57 +08:00
halx99 2d518922ba Improve cmake 
If no system libvlc, try use prebuilt.
 2023-06-13 00:10:53 +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
Deal(涓€绾跨伒) 9247371625 Fix #1204 2023-05-10 13:45:40 +08:00
axmol-bot e1c64d8e4c Update thirdparty prebuilts to v51 (#1197) 2023-05-04 21:00:21 +08:00
Deal(涓€绾跨伒) 46a21e729b Building with ninja + official llvm-clang-cl support (#1159) 
* Building with ninja + official llvm-clang-cl support

* Update gh ci for clang

* Fix ci

* Fix ci

* Fix ci

* FIx dll copy [skip ci]

* Fix ci warnings

* Update ci files and readme

* Update badges
 2023-04-02 16:04:19 +08:00
Deal(涓€绾跨伒) f6281b9504 Support clang-cl + ninja, refer to #1152 (#1153) 2023-04-01 23:11:58 +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 2f04914405 [UWP] Add cmake option: AX_VS_DEPLOYMENT_TARGET 
a. It's useful to specify UWP apps deploy target version, vs property is
TargetPlatformMinVersion
b. Use `CMAKE_VS_WINDOWS_TARGET_PLATFORM_MIN_VERSION` possible
supported by cmake-3.27.0 or later
 2023-03-14 08:24:27 +08:00
halx99 09c8383e93 Set default UWP min deploy target to 10.0.19041.0 2023-03-12 19:00:35 +08:00
halx99 760c59ab6e [UWP] set VS_WINDOWS_TARGET_PLATFORM_MIN_VERSION for all targets 2023-03-12 17:57:54 +08: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 d487b3128c Fix #1088 2023-03-04 15:38:39 +08:00
halx99 01a74f3b61 Fix #1082 2023-02-27 15:43:35 +08:00
halx99 cc9cb5f38e [CMake] Improve link prebuilts 2023-02-24 19:33:26 +08:00
Deal(涓€绾跨伒) 83d53ba46b Tidy project tree and full symlink support (#1072) 
* Tidy project file tree and all symlink support
 2023-02-23 21:57:30 +08:00
halx99 452754981a [CMake] Add symlink support, refer to #1005 
- Rename ax_<xxx>_copy_xxx to ax_<xxx>_sync_xxx
- Add optional arg `SYM_LINK`
 2023-02-22 23:37:32 +08:00
halx99 eae4f97d3a Fix vs-ninja build 2023-01-14 16:33:35 +08:00
halx99 b35552fce7 Use 1 line cmake command copy target runtime dlls 2023-01-06 19:11:10 +08:00
halx99 79b90a95dd Fix dll linkage 2023-01-06 18:38:16 +08:00
halx99 5cb2f1d57f Fix ci 2023-01-03 15:20:11 +08:00
halx99 f7b8c6528a Fix #991 2023-01-03 15:09:45 +08:00
CHP ac337df402 Update AXBuildHelpers.cmake (#1004) 2023-01-03 09:20:30 +08:00
CHP 10088a72d1 Use standard cmake CMAKE_CXX_STANDARD instead of CXX_STD (#987) 
* Update AXConfigDefine.cmake

* Use standard cmake CMAKE_CXX_STANDARD instead of CXX_STD

* Fix formatting

* remov empty line

* Update AXConfigDefine.cmake

Fix typo
 2022-12-20 11:31:52 +08:00
RH 5bcc560c9e Fix axmol command search paths (#989) 
* Committing genbindings changes

* Fix incorrect environment variable name and console folder path
 2022-12-20 11:31:25 +08:00
CHP fa89bb6706 Improve lua cmake (#986) 2022-12-17 16:35:20 +08:00
halx99 1ca8c3fa0e Fix ci 2022-12-17 14:31:23 +08:00
halx99 658f5bbc0f Fix ci 2022-12-17 13:19:26 +08:00
halx99 ad83c5e95f Move SIMD detection to AXConfigDefine.cmake 2022-12-17 11:56:48 +08:00
AsakuraMizu ff8e10f280 fix linux prebuilt support 
now lua-template can also use this feature
 2022-11-17 23:20:26 +08:00
AsakuraMizu 0f32899747 experimental linux prebuilt support 2022-11-17 22:25:13 +08:00
AsakuraMizu 999cb7a904 Update AXLinkHelpers.cmake 2022-11-16 17:03:39 +08:00
halx99 7d1a911b91 Remove unnecessary platform macro define in cmake 2022-11-01 19:00:48 +08:00
halx99 abd9338a7a Migrate [skip ci] 2022-10-18 19:13:40 +08:00
涓€绾跨伒|Deal f72f18ce64 Merge: 6220071b3b 97fc3b7bcf 
Merge pull request #896 from crazyhappygame/patch-1

Enable C++20 by default
 2022-10-06 08:50:39 +08:00
CHP 026e694b5f Delete setup_android.py 
This file is not needed with latest android SDK
 2022-10-05 21:18:06 +02:00
CHP 6886e985a2 Enable C++20 by default 
Enable C++20 by default
 2022-10-05 20:24:33 +02:00
涓€绾跨伒|Deal 4a52cacbec Set default c++ standard to 17 [skip ci] 2022-10-05 13:20:04 +08:00
halx99 2c818612b3 Fix ci 2022-10-05 11:01:46 +08:00
aismann 6af62a4b08 Clipper2 1.05 (only files with changes on source lines) 2022-10-04 18:54:12 +02:00
涓€绾跨伒|Deal 155fea245b Update AXConfigDefine.cmake 2022-10-04 11:39:32 +08:00
涓€绾跨伒|Deal 48a7da97d6 Final migrate (#876) 2022-10-01 16:24:52 +08:00
halx99 99f299d5c4 Update thirdparty prebuilt libs 
- curl-7.85.0
- angle-2.1.19119 on branch `chromium/5195`
 2022-09-12 22:46:35 +08:00
Paulo Coutinho f5aeb5a8c2 Add apple tvos support (#846) 
* support tvos

* support tvos and fix run command

* support tvos, fix run script and fix windows files

* support tvos on ci

* support tvos on ci and fix windows zlib

* support tvos on ci

* support tvos

* support tvos and tvos tests
 2022-09-05 14:13:52 +08:00
halx99 efe9e36816 Check AX_ENABLE_MSEDGE_WEBVIEW2 2022-09-02 20:06:05 +08:00
halx99 af9731d987 Copy angle dll when AX_USE_COMPAT_GL=true 2022-09-02 19:24:22 +08:00
halx99 ec1a06afe8 Fix typo 2022-09-02 10:36:25 +08:00
涓€绾跨伒|Deal e37761260a Migrate, use simple namespace ax (#818) 2022-08-29 20:51:22 +08:00
halx99 843ee9779b Fix #810 2022-08-19 19:52:10 +08:00
涓€绾跨伒 3d72e8e58e Update AXLinkHelpers.cmake 2022-08-19 10:12:06 +08:00
halx99 b1287b8cc5 Migrate cmake files 2022-08-11 15:41:10 +08:00
涓€绾跨伒 9892aa3d1c Migrate axys (#782) 2022-08-08 18:02:17 +08:00
halx99 2c6fde019b Migrate macro COCOS2D_DEBUG, refer #751 2022-07-19 15:34:26 +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 906c60e40e Fix setup cmake files and some relative sources 2022-07-08 14:20:41 +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 4301448ba4 Set default encoding to UTF-8 [skip ci] 2022-06-16 21:18:31 +08:00
Turky Mohammed fc2ff5003f Update CCParticleSystem.h 2022-06-16 14:13:59 +03:00
halx99 51b6e5391f Fix ci, astc only support sse2 for x86 target 2022-06-16 12:22:39 +08: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
halx99 cdbfe0d0e6 Remove dep libiconv since we don't required 2022-06-11 15:34:12 +08:00