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

256 Commits

Author SHA1 Message Date
halx99 af98934992 Fix ci 2023-08-15 18:21:17 +08:00
halx99 d427fd8767 Improve DeviceInfoGL 2023-08-15 18:02:02 +08:00
Deal 7052dd4475 Improve astc support detection 2023-08-15 00:37:16 +08:00
halx99 95737f3440 Fix astc detection 2023-08-14 23:33:02 +08:00
halx99 69c13a905f Improve code style 2023-08-14 23:07:13 +08:00
halx99 bfe167121e Add cmake option AX_GLES_PROFILE 
Valid value of AX_GLES_PROFILE: 0, 200, 300

By default, the AX_GLES_PROFILE is:

- android: 200, allow axmol apps runs on: API 17 Android 4.2+ devices
- winuwp: 300
- Win32/linux/osx/ios/tvos: 0

For ios/tvos, will forcing AX_GLES_PROFILE to 300 if AX_GLES_PROFILE not 0
 2023-08-14 20:40:05 +08:00
Deal 9dc9e9adc7 Update android.yml 2023-08-13 23:58:18 +08:00
halx99 bd0e1fef4b Fix compile error 2023-08-13 22:09:02 +08:00
Deal 572bb2f700 Test use glad on android 2023-08-13 00:24:35 +08:00
halx99 cc9cbcbff9 Merge: eba7fc17ba 6bbdc273f8 
Merge branch 'main' into dev
 2023-08-10 18:53:35 +08:00
halx99 46ed10dac3 Update yasio to v4.1.0 2023-08-10 18:36:45 +08:00
halx99 ec3b06aa33 Improve cmake options 2023-08-10 13:33:22 +08:00
halx99 f63932bb91 Update ios GLES to GLES3 2023-08-09 22:25:15 +08:00
halx99 7a40c94e2a Check vao creation 2023-08-09 21:46:03 +08:00
halx99 1ec408812f Fix cmake setup 2023-08-09 14:37:43 +08:00
Deal 969baf94d4 Update CHANGELOG [skip ci] 2023-08-09 13:52:28 +08:00
halx99 9452e88272 Fix label outline effect 2023-08-09 13:26:57 +08:00
halx99 e6039273f5 Reset texture binding state when deleteTexture 2023-08-05 23:08:37 +08:00
halx99 28150610be Improve code style 2023-08-02 11:34:06 +08:00
halx99 2d0a63660f Improve custom program draw batch 2023-08-02 10:31:52 +08:00
halx99 30306ad316 Delete glsl-optimizer due to new shader workflow only require offline tool glslcc 2023-08-01 12:12:10 +08:00
halx99 5a68442d1e Improve code style 2023-08-01 12:00:31 +08:00
halx99 1a3a4fa0eb Implement metal instancing draw 2023-07-31 10:03:24 +08:00
halx99 805b115719 Update lua bindings 2023-07-29 21:30:35 +08:00
halx99 bba3818829 Fix gray shader name 2023-07-29 17:46:10 +08:00
halx99 9624ec4663 Fix android image reference issue 2023-07-28 15:21:56 +08:00
halx99 a04c2d6945 Merge pull request #1253 from DelinWorks/instancing-support 
Co-authored-by: Turky Mohammed <45469625+DelinWorks@users.noreply.github.com>
 2023-07-28 14:24:58 +08:00
Deal ec4e5e1258 Fix ProgramGL uniform stage 2023-07-28 13:45:52 +08:00
halx99 0f642ddb2e Improve shader module and empty texture managment 2023-07-28 11:46:34 +08:00
halx99 d882208b8b Improve code style 2023-07-28 10:37:27 +08:00
halx99 2191b51499 [WIP] Not convert mat3 to mat3x4 in engine 
Because both metal and GLSL3/ESSL3 mat3 is identical to mat3x4, so provide a
class Mat3 to handle GPU mat3x3
 2023-07-27 22:36:51 +08:00
halx99 c8464ed5db Remove unnecessary uniform convert 2023-07-27 20:37:06 +08:00
halx99 286ff503c5 Improve sgs binary reflect info read 2023-07-27 19:13:09 +08:00
halx99 edee8af2a6 Fix metal render issues 
- Fix metal uniform buffer alignment size
- Fix spine two color tint render for metal
- Update glslcc to 1.9.0
 2023-07-27 18:21:16 +08:00
halx99 a3548bbe3d Fix metal uniform block member offset and size 2023-07-26 20:05:16 +08:00
halx99 cf69428746 Use macro for shader location binding 2023-07-25 19:06:12 +08:00
halx99 ea2124bb2e Fix ci 2023-07-25 10:18:14 +08:00
halx99 c37af4c38e Improve shader managment 
1. Rename uniformId to batchId, refine batch draw check logic, not use xxhash to compute uniforms id
2. Material works, not check all cpp-tests, but some 2d/3d material works fine
3. Shader load/cache API improvements.
4. BREAK compatibliity: Node::setProgramState change parameter needsRetain to ownPS and value inverted.
5. custom vertexLayout setup: add new API ProgramState::getMutableVertexLayout, mark ProgramState::setVertexAttrib deprecated.
6. ProgramManager registerCustomProgram change to gen progId by vsName, fsName
with xxhash64, if register succed, user can load it by progId with `loadProgram`
7. Add API ProgramManager::loadProgram for loading builtin by progType or
loding a custom program by id
8. Add API ProgramManager::loadProgram to load program by vsName, fsName
immediately without register as CUSTOM_PROGRAM
9. Add API Node::setProgramStateByProgramId(progTypeOrId); for set programState with
programType or programId explicit.
10. Migrate material load logic
 2023-07-25 09:40:05 +08:00
halx99 5a0838e52b Migrate materials 2023-07-23 21:43:25 +08:00
halx99 0d4a274d41 Fix incorrect ubo upload 
because ubo was share in ProgramGL
 2023-07-21 20:49:06 +08:00
halx99 756e860794 Fix state for multi gl context 
Solve imgui multi-viewport afterimage problem
 2023-07-21 19:32:44 +08:00
halx99 1434b1a6c9 Add optimizing comment[skip ci] 2023-07-21 08:37:21 +08:00
halx99 ea91aebb91 Improve gl state cache 2023-07-21 07:59:38 +08:00
halx99 76f00b4456 Make renderer works on opengl core profile mode 2023-07-20 20:23:56 +08:00
halx99 71c2d3a3b1 Init axslc search path at ProgramManager init 2023-07-20 10:20:06 +08:00
halx99 1b4c9bbec8 Auto compile app/Sources/shaders to axslc/custom 2023-07-19 23:41:16 +08:00
halx99 7bd3b57809 Improve code style 2023-07-19 21:12:25 +08:00
halx99 bc6cdf0b11 Fix ci 2023-07-19 21:04:50 +08:00
halx99 e11b8de571 Fix ci 2023-07-19 19:53:32 +08:00
halx99 42f666ff89 Refactor GL uniform block support 2023-07-19 19:20:06 +08:00
halx99 04c5505fa2 Fix glDisable state guard 2023-07-19 18:35:05 +08:00
Deal eae07123dc Refer to #1278 2023-07-19 09:10:46 +08:00
Deal 6207431e6e Fix glDisable state guard 2023-07-19 00:17:10 +08:00
Turky Mohammed 7759ad562f Optimize `OpenGL` State Management (#1269) 
Co-authored-by: halx99 <halx99@live.com>
 2023-07-18 21:16:21 +08:00
halx99 a858d08cc3 FIx GL error 2023-07-18 15:16:29 +08:00
halx99 3d4b03b6a2 Fix UWP build 
- Use compatible GLES API: glGetActiveUniform
- glGetActiveUniformName not present in both GLES3 and GLES2
 2023-07-18 00:10:57 +08:00
halx99 1c669912b5 More easy for dev 2023-07-17 20:51:28 +08:00
Deal 071d9aa8ea Remove gitter [skip ci] 
It's only bakup IM room, discord is preferred
 2023-07-17 12:39:19 +08:00
Turky Mohammed d3ee6c41c3 Implement `Uniform Buffer Objects` in OpenGL (#1277) 2023-07-17 11:39:12 +08:00
halx99 bc6f8802e6 Remove binding index for shader uniform block 
Not required
 2023-07-16 22:10:48 +08:00
halx99 e34fe4ba98 Fix light num configure type 2023-07-16 14:38:06 +08:00
halx99 b2fdbb9b21 Commits migrated engine builtin shaders 2023-07-16 14:15:14 +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 ac778081d1 Remove unnecessary light define checks 2023-07-16 00:42:16 +08:00
halx99 09d8f849fe Fic ci 2023-07-15 23:52:25 +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 c6b575e666 Revert define on shader, not suitable glslcc 2023-07-14 23:21:51 +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 aeb6268f1c Fix cpp-tests shader loads 2023-07-11 16:40:49 +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
j-jorge fcdbd9968e Add missing include guards. (#1265) 2023-07-10 08:47:20 +08:00
RH 6bc2deeba8 Update Sprite::getQuad() to return const reference (#1260) 2023-07-09 19:00:12 +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 25077669c8 For bot happy 2023-07-07 04:05:56 +08:00
halx99 7cb9aac41e Rename option `AX_USE_COMPAT_GL` to `AX_USE_ANGLE` 2023-07-03 20:35:55 +08:00
halx99 1ed5596377 Update docs 2023-06-12 14:15:37 +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(涓€绾跨伒) 621c94c9e7 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
halx99 90f441441e For clang-format happy 2023-03-28 00:07:33 +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
Sam ba935d7dd0 Improve Android performance (#1125) 
* Improve Android performance

* Remove unused memset

* Using the same code as Metal.

* Add a comment
 2023-03-21 19:43:37 +08:00
Yehsam23 9b0b6fd4ce Impore Metal Renderer Dirty Detection. (#1120) 
Remove setTargetFlags _dirty
 2023-03-15 11:09:20 +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
RH 8d52ad2e56 Add missing renderer source file references to CMakeLists.txt (#1100) 
* Add missing file references to CMakeLists.txt
 2023-03-07 18:51:58 +08:00
Andreas Loew d444937358 display error message if shader initialization fails (#1051) 2023-02-09 23:07:36 +08:00
Deal(涓€绾跨伒) 4d608eba39 Fix #990 2023-02-09 21:40:38 +08: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
Turky Mohammed 35549b128c Update positionColorLengthTexture.vert (#1021) 2023-01-08 09:36:14 +08:00
涓€绾跨伒|Deal 210eb3f3ab fix typo 2023-01-07 20:24:49 +08:00