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

53 Commits

Author SHA1 Message Date
halx99 07b51489e5 More easy for dev 2023-07-17 20:51:28 +08:00
halx99 b47830a328 Fix glslcc cmdline error 2023-07-17 08:14:13 +08:00
halx99 2ce766ec24 Fix cmake option not working 2023-07-16 21:58:26 +08:00
halx99 304a9df553 Auto enable early features in branch 'dev' 2023-07-16 15:19:29 +08:00
halx99 15a8db3ac4 Fix light num configure type 2023-07-16 14:38:06 +08:00
halx99 81051d0483 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
halx99 7afdd4f2c1 Add cmake option AX_ENABLE_EARLY_FEATURES 2023-07-15 01:02:13 +08:00
halx99 0ad75cc175 [GLSLCC] Remove spec defines, because the behavior incorrect 2023-07-10 17:02:20 +08:00
halx99 89a739a8ea [GLSLCC] Suppression macro not defined errors 2023-07-09 12:04:58 +08:00
halx99 af220f85af Bump new shader workflow 
1. Add compiled shader dir `axslc` to search path for win32,linux
    2. ProgramManager: register shader program by shader name
    3. modify all shader  define from sources to name in Shader.cpp/Shader.hpp
    4. Remove shader version define and precision decls for GLES
 2023-07-08 18:47:06 +08:00
halx99 167b81d5cd Bump 1.1.0 2023-07-06 20:37:59 +08:00
Deal(一线灵) 42362c61a4
Fix ci 2023-07-06 19:36:27 +08:00
halx99 90aa74cdfa 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 2786031541 Update setup.py to setup.ps1 in cmake [skip ci] 2023-07-06 14:00:21 +08:00
Deal(一线灵) 802e7052c1
Use glad for android GLESv3 support 2023-07-04 17:34:12 +08:00
Deal(一线灵) e3f33fe9c2
Fix CMakeLists.txt 2023-07-03 21:16:33 +08:00
halx99 5cbcb7fc0d Rename option `AX_USE_COMPAT_GL` to `AX_USE_ANGLE` 2023-07-03 20:35:55 +08:00
halx99 3331a557f6 Improve CMakeLists.txt 2023-06-13 20:44:20 +08:00
halx99 8da6990fff Improve cmake 
If no system libvlc, try use prebuilt.
 2023-06-13 00:10:53 +08:00
halx99 e1a588d5f5 Improve engine version definitions 2023-06-12 09:14:23 +08:00
Deal(一线灵) d57706b8ae
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(一线灵) 7a24a89ca8
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(一线灵) de7fdee6e4
Enable video player(VideoTexture) based on new MediaEngine for macOS and tvos (#1154) 
* Ready for PR macOS

* Update videoTexture.frag

* Fix compile

* Fix h265 for mac [skip ci]

* Fix compile error

* Update readme [skip ci]
 2023-04-02 01:51:36 +08:00
RH 6ad2152333
Ensure that the axmol engine git folder is the one used for versioning (#1149) 
* Committing genbindings changes

* Fix compilation error related to redefinition of 'pause'
Fix update override warning
Improve code

* Revert "Fix compilation error related to redefinition of 'pause'"

This reverts commit 1744a48fec.

* Ensure that the engine .git folder is the one being referenced for versioning
 2023-03-31 08:04:38 +08:00
halx99 ee2de093a7 Done #1139 2023-03-30 22:08:53 +08:00
Deal(一线灵) 3d23eea8d0
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
Deal(一线灵) b46417809d
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 d72d21de81 Fix #1082 2023-02-27 15:43:35 +08:00
halx99 d1e9308ede Improve windows optional modules 2023-01-11 22:28:14 +08:00
CHP d79156d728
Improve Android cmake (#985) 
* Update CMakeLists.txt

* Improve Andoid CMAKE
 2022-12-17 16:35:34 +08:00
halx99 19e2a77bb4 Fix #958 2022-11-10 21:22:55 +08:00
一线灵|Deal 39b57ae939
Improve code quality (stage1.Oct) (#916) 
* Improve code quality

* Add env PULL_REQUEST [skip ci]

* Update build.ps1

* Fix ci [skip ci]

* Update ZipUtils.cpp

* Update build.ps1

* Resolve reviews

* Improve

* Improve code style

* Resolve reviews

* Use pod_vector

* Improve resize growth

* Update CCAnimation3D.cpp

* Update axstd.h [skip ci]
 2022-10-13 21:44:42 +08:00
CHP 825cfd05bb
Update CMakeLists.txt (#922) 
* Update CMakeLists.txt

* Update CMakeLists.txt
 2022-10-12 07:04:01 +08:00
CHP 01e3b209fb
Fix noisy message "Unable to resolve full path of PCH-header" (#918) 
* Update CMakeLists.txt

fix noisy message "Unable to resolve full path of PCH-header"

* Update CMakeLists.txt

* Update CMakeLists.txt
 2022-10-11 08:54:02 +08:00
CHP 58c311f63d
precompile_headers all platforms (#901) 2022-10-10 03:52:04 +08:00
一线灵|Deal 5645bb241e
Final migrate (#876) 2022-10-01 16:24:52 +08:00
一线灵|Deal 33b67fa0df
Migrate, use simple namespace ax (#818) 2022-08-29 20:51:22 +08:00
一线灵 bf4c7fefa8
[CMake] Mark engine pch as private 2022-08-19 12:15:49 +08:00
halx99 9150b9db83 Migrate cmake files 2022-08-11 15:41:10 +08:00
一线灵 13fc72c02c
Migrate axys (#782) 2022-08-08 18:02:17 +08:00
halx99 fff2bd59ed Fix setup cmake files and some relative sources 2022-07-08 14:20:41 +08:00
DelinWorks 49b6dda016 Fix CMAKE 2022-07-08 02:10:35 +03:00
halx99 8ef23c7fe9 Tidy audio module code 2022-05-15 09:55:57 +08:00
halx99 30a164c31a Improvements and bug fixes 
Improve ResizableBufferAdapter style

    Improve extesnion adxelua

    Improve code quality

    Fix lua-tests BillBoardTest

    Sync texture pixel format enum values for adxelua

    Fix luaval_to_vec2 parameter location

    Improve windows workflow

    Improve cmake scripts

    Take care Texture2D::setDefaultAlphaPixelFormat use
 2022-05-13 21:06:29 +08:00
halx99 bf2cc6205b Improve Ninja build with visual studio ide 
a. Disable PCH for Ninja, just a workaround fix compiler always said: can't open xxx.pch files
b. Remove unnecessary definition _WINSOCKAPI_ for Ninja build
 2022-04-27 18:48:57 +08:00
Shatyuka d71c620fc1 Compatible with Ninja 2022-04-26 15:16:02 +08:00
halx99 a0702dfdb6 Try fix windows ci 2022-04-24 21:23:28 +08:00
deal 7a89757385
Add windows video play support [render video sample to texture2d] (#577) 
* [Draft] Implement windows video player

Based on microsoft media foundation

* Delete pvd

* Shutdown MF media before release player

* Consider MFMediaPlayer ref leak

* Use Microsoft::WRL::ComPtr

* Simplify code

* Improve code and take care COM object refs

* Update UIVideoPlayer-win.cpp

* Delete unused code

* Add play from url support

* Update logic

* Rename ADXE_ENABLE_MFMEDIA to AX_ENABLE_MFMEDIA

* Rescale video render sprite to view node

* Fix warnings

* Don't shallow copy the video context, it's very dangerous

* Fix compile error CC_VIDEOPLAYER_DEBUG_DRAW=1

* Fixup

* [Window video player] play event dispatch

* support switch video file

* Update UIVideoPlayer-win.cpp

* [windows-video-player] keep aspect ratio and full screen support

* Improve code

* Update changelog [skip ci]

* Update README.md

* Update README.md

* Update README.md

* Update README_CN.md

* Update README_CN.md
 2022-02-24 17:57:08 +08:00
halx99 67c6bcec4f [cmake] Rename BUILD_LUA_LIBS to AX_ENABLE_EXT_LUA 2022-02-17 21:31:39 +08:00
halx99 818e563e51 Finish #578 2022-02-17 17:11:17 +08:00