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

246 Commits

Author SHA1 Message Date
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
j-jorge c2d7bdcb45 Allow unity builds on a subset of the sources. (#1266) 
In order to allow unity builds we need to avoiding "using namespace"
at file scope, #undef our file-specific #defines, and avoid having
static functions with identical name and signature.
 2023-07-15 19:06:54 +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
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
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 7c410f8b25 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 7cb9aac41e Rename option `AX_USE_COMPAT_GL` to `AX_USE_ANGLE` 2023-07-03 20:35:55 +08:00
halx99 928100186f Fix #1243 2023-06-26 09:12:29 +08:00
halx99 c06d5af3f8 Move queueOperation from GLView to Director 2023-06-25 01:17:29 +08:00
halx99 3eac3abecf Sync yasio to latest 2023-06-24 21:18:27 +08:00
halx99 02cc0a1743 Delete unused sources 2023-06-11 19:21:05 +08:00
halx99 63175a193e Move win32 _ftruncate impl to base/posix_io.cpp 2023-06-11 19:19:12 +08:00
halx99 2cd3f8c6c9 Move posix io macros to base/posix_io.h 2023-06-11 14:39:19 +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 2da66a8f1f Improve gradle script 2023-06-06 11:15:46 +08:00
halx99 8bbe962704 Update JNI call 2023-06-05 21:55:23 +08:00
halx99 f0db2648fe [FEATURE] Add new API GLView::queueOperation 
- Queue a priority operation in render thread, even through app in background
- Please do logic in callback, don't update ui or any other render state

usage

```
Director::getInstance()->getOpenGLView()->queueOperation([](void* param){
// do somethings for logic only(Don't update render state or UI)
});
```
 2023-05-31 20:42:39 +08:00
Deal(涓€绾跨伒) 4aba036936 Remove duplicate using 2023-05-31 20:32:07 +08:00
Maksymilian Galas 6b5ee65d6e Add support for haptic feedback on iOS and Android devices (#1222) 
* Add support for haptic feedback on iOS and Android devices

* Disable haptic feedback on tvOS

* Remove unused import
 2023-05-31 20:14:31 +08:00
Deal(涓€绾跨伒) dca6c87c4a [Refine] Improve exit flow (#1213) 2023-05-25 15:45:00 +08:00
halx99 80354a98c1 Fix UWP mouse scroll delta process 2023-04-02 14:31:51 +08:00
Deal(涓€绾跨伒) f6281b9504 Support clang-cl + ninja, refer to #1152 (#1153) 2023-04-01 23:11:58 +08:00
halx99 cd10baf7e5 Add FileStream::getNativeHandle() 2023-03-26 22:42:13 +08:00
halx99 2e261b3dab Fix ci 2023-03-25 16:08:48 +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 912bf32d13 Remove UWP from PC family 2023-03-14 12:08:31 +08:00
halx99 517ffeedc6 Update project url in sources 2023-03-12 01:44:55 +08:00
halx99 0fbda93c39 [UWP] Add API GLViewImpl::createFullScreen 
- Fix for luabindings
 2023-03-11 23:19:52 +08:00
halx99 1152c73575 Fix ci 2023-03-11 23:14:04 +08:00
halx99 360950f1d7 Improve API GLViewImpl::createWithRect 2023-03-11 22:53:55 +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 8bf4817ff7 Fix compile errors in c++17 2023-03-08 08:34:17 +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 70cef3ca58 Check astc image header wildcard for some extesion formats [skip ci] 2023-02-18 11:43:44 +08:00
halx99 e6a3aedff0 Working on c++23 
There are many more efficient features on future c++23 standard
 2023-02-18 11:39:31 +08:00
halx99 97c77d4c9d Fix ci 2023-01-24 15:49:40 +08:00
halx99 4b6692ece0 Fix platform macro pred 2023-01-24 13:58:29 +08:00
halx99 2727d18250 Fix macro detect 2023-01-24 11:09:16 +08:00
Joilnen 93d6f2c69d fixing a warning message (#1035) 2023-01-22 14:10:39 +08:00
Deal(涓€绾跨伒) 52cb279f75 Update CCGLViewImpl-desktop.cpp 2023-01-22 07:39:46 +08:00
halx99 04cbc8dfb7 Fix ci 2023-01-21 21:57:28 +08:00
halx99 71b4287688 Fix ci 2023-01-21 20:04:58 +08:00
halx99 fc5025da10 Fix osx ci 2023-01-21 19:24:58 +08:00
halx99 7faca1e74a Fix ci 2023-01-21 18:49:02 +08:00
halx99 27a38b2335 Unify CCGLViewImpl-desktop 2023-01-21 17:57:56 +08:00
halx99 3e4be65a8f Fix osx ci 2023-01-21 16:56:04 +08:00
halx99 ae14727dc7 Fix #1032 2023-01-17 10:06:09 +08:00
halx99 fa9f663e3a Don't use deprecated function 2023-01-11 23:28:22 +08:00
pietpukkel c09449d40b Resize on Windows (#1026) 
* Resize on Windows

Fixed resize on Windows

* Better code quality

Co-authored-by: <halx99@live.com>
 2023-01-11 22:24:43 +08:00
halx99 f739f49eaf Make linux defautSearchRoot same with win32 2023-01-10 23:06:04 +08:00
halx99 e86f2e3f73 Fix ci 2023-01-05 00:35:55 +08:00
halx99 bc9e4483e9 Fix ci 2023-01-05 00:31:08 +08:00
halx99 66be2a592e Fix ci 2023-01-04 23:21:24 +08:00
halx99 98efcfe193 Update yasio to latest 2023-01-04 23:20:07 +08:00
halx99 aeedf0daee Improve posix macro definations 2023-01-04 23:05:52 +08:00
halx99 a8916dfd50 Preferred use ax::print for engine log output 2023-01-04 22:52:40 +08:00
halx99 429e62ff95 Merge: 427ae694bd b5cde53994 
Merge branch 'dev' of https://github.com/axmolengine/axmol into dev
 2023-01-04 21:26:23 +08:00
halx99 8c9cda5b16 Fix http request issue when path empty from url 
Ensure path can be use for http request directly
 2023-01-04 21:26:01 +08:00
CHP a6b09af092 ANDROID_SDK_ROOT -> ANDROID_HOME (#1009) 
* Update setup.py

* ANDROID_SDK_ROOT -> ANDROID_HOME
 2023-01-04 08:03:48 +08:00
halx99 0684ac0ef4 Fix charset process in glfwCharCallback 2022-12-18 11:52:57 +08:00
Vincent Lee 5f6e1cd42d Fix warnings (implicit conversion loses and use of deprecated function) 2022-11-20 09:58:34 +09:00
joilnen 5214ea1eb1 fixing some warnings compilation in linux gcc 12.2.0 2022-11-14 15:46:27 -03:00
涓€绾跨伒|Deal c1a576558e Update axutils.gradle 2022-11-10 23:25:45 +08:00
halx99 d742dceb9f Improve gradle scripts 
Add cmake options from gradle command line properties support
 2022-11-10 22:53:54 +08:00
halx99 3d1bf684a4 Fix ci 2022-11-10 22:03:40 +08:00
halx99 0279d5c158 Fix #958 2022-11-10 21:22:55 +08:00
halx99 df91bc9d69 Improve ftruncate 2022-11-10 13:45:51 +08:00
halx99 7d1a911b91 Remove unnecessary platform macro define in cmake 2022-11-01 19:00:48 +08:00
halx99 a4d8687066 Improve platform macro detection 2022-11-01 18:31:31 +08: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
涓€绾跨伒|Deal 2a440a8c42 Update CCFileUtils-apple.mm 2022-10-31 08:12:06 +08:00
涓€绾跨伒|Deal 22f51204f7 Fix ci [skip ci] 2022-10-31 08:09:55 +08:00
halx99 56d66aba67 Remove FileUtils::searchResolutionsOrderArray 2022-10-30 23:03:39 +08:00
涓€绾跨伒|Deal d6254accc9 Improve code style 2022-10-30 16:58:48 +08:00
halx99 84fe8f734a Update glad to v2.0.0 2022-10-25 09:01:57 +08:00
halx99 87000c35fc Add ETC2 support in pvr3ccz format 2022-10-24 19:06:49 +08:00
halx99 abd9338a7a Migrate [skip ci] 2022-10-18 19:13:40 +08:00
涓€绾跨伒|Deal 25d93bd509 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
涓€绾跨伒|Deal 6f1c8d61d7 Add reasonable comment for performance code 2022-10-08 12:26:38 +08:00
halx99 db1df2f98a Improve code style 2022-10-07 21:48:07 +08:00
halx99 3f40f271d4 Improve performance 2022-10-07 21:36:38 +08:00
涓€绾跨伒|Deal 48a7da97d6 Final migrate (#876) 2022-10-01 16:24:52 +08:00
tkzcfc 6ec826dfe0 Add macro definition AX_NO_DUP_SEARCH_PATH (#874) 2022-09-30 14:40:52 +08:00
tkzcfc 5870445c87 Improve FileUtils::addSearchPath(#872) 
Avoid duplicate search path
 2022-09-29 23:10:30 +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
涓€绾跨伒|Deal e0e083aa3b Merge: 6df48e9f8b baceccbb2f 
Merge pull request #837 from aismann/ISSUE_#825

#825
 2022-09-02 11:59:46 +08:00
halx99 ec1a06afe8 Fix typo 2022-09-02 10:36:25 +08:00
aismann 68f8a2b0c7 #825 2022-09-01 13:51:19 +02:00
halx99 5298ed90cb Fix #817 2022-08-31 13:45:06 +08:00
涓€绾跨伒|Deal e37761260a Migrate, use simple namespace ax (#818) 2022-08-29 20:51:22 +08:00