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

642 Commits

Author SHA1 Message Date
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
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 ae14727dc7 Fix #1032 2023-01-17 10:06:09 +08:00
Deal(涓€绾跨伒) 643d1bfaf0 Update CocosGUI.h 2023-01-12 11:55:16 +08:00
halx99 090879123c Update comment [skip ci] 2023-01-12 09:54:47 +08:00
halx99 fa9f663e3a Don't use deprecated function 2023-01-11 23:28:22 +08:00
halx99 5c42e19788 Improve windows optional modules 2023-01-11 22:28:14 +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
Turky Mohammed b04c8f5735 [BUG] fix _AX_HAVE_WEBVIEW2 compilation error when not defined. (#1020) 
* make _AX_HAVE_WEBVIEW2 actually work

* Exclude other platforms

* Update UIWebView-inl.h
 2023-01-08 09:36:43 +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
涓€绾跨伒|Deal 4d0ffcdbdb Fix typo 2023-01-07 19:46:20 +08:00
aismann f238e5e0ff Improve drawCircle rendering for big rings (#1013) 
* Update HelloWorldScene.cpp

replace   _director->end();  with menuCloseCallback(this);

* Rendering drawCircle
 2023-01-06 23:25:31 +08:00
halx99 79b90a95dd Fix dll linkage 2023-01-06 18:38:16 +08:00
涓€绾跨伒|Deal 644fa8d01a Update HttpCookie.cpp 2023-01-04 21:21:16 -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 2410e7a782 Change HttpRequest::getTag return type from const char* to std::string_view 2023-01-04 23:37:57 +08:00
halx99 66be2a592e Fix ci 2023-01-04 23:21:24 +08:00
halx99 90e964ca6f Fix ci 2023-01-04 23:20:31 +08:00
halx99 98efcfe193 Update yasio to latest 2023-01-04 23:20:07 +08:00
halx99 be9675ff1f Improve code style 2023-01-04 23:06:52 +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 cb35a48885 Take care lambda implicit capture std::string_view 
refer to: #1002
 2023-01-03 23:02:17 +08:00
halx99 2522b1ef45 Fix feature check for MSVC 2023-01-03 18:01:40 +08:00
halx99 2cc1e540ac Fix ci 2023-01-01 23:31:24 +08:00
halx99 82214b4183 Avoid packet GC 
yasio-3.39.7 introduce YOPT_S_FORWARD_EVENT.
 2023-01-01 23:11:32 +08:00
halx99 b644220459 Fix ci 2023-01-01 18:41:48 +08:00
halx99 319aaf3a49 Renaming performFunctionInCocosThread to runOnAxmolThread 2023-01-01 18:08:25 +08:00
halx99 0f97e3fa3a Improve base64 API 
Move base64Encode/base64Decode to namespace `ax::utils`
 2023-01-01 18:07:18 +08:00
涓€绾跨伒|Deal bc491ca743 Remove unused 2023-01-01 18:01:01 +08:00
Turky Mohammed 4ceadb9740 [IMPROVEMENT] Remove camera unnecessary perspective option. (#993) 
* Fix camera applyZoom when window size changes

* Revert "Fix camera applyZoom when window size changes"

This reverts commit 26154b5ff7.

* Fix pr

* remove camera perspective option

* fix merge conflict

* Update CCCamera.cpp

* Update CCCamera.h
 2022-12-29 16:54:26 +08:00
Turky Mohammed d7a6a64517 [BUG] Fix camera `applyZoom()` when window size changes and remove unnecessary projection code (#992) 
* Fix camera applyZoom when window size changes

* Revert "Fix camera applyZoom when window size changes"

This reverts commit 26154b5ff7.

* Fix pr
 2022-12-29 16:54:01 +08:00
pietpukkel 2dcf76a88a Fix for UIEditBox password on Mac/iOS (Montery+/15+). (#995) 
Fix for UIEditBox password on Mac/iOS (Montery+/15+).
 2022-12-27 14:26:09 +08:00
halx99 0684ac0ef4 Fix charset process in glfwCharCallback 2022-12-18 11:52:57 +08:00
CHP 8d36190c98 Improve Android cmake (#985) 
* Update CMakeLists.txt

* Improve Andoid CMAKE
 2022-12-17 16:35:34 +08:00
halx99 ad83c5e95f Move SIMD detection to AXConfigDefine.cmake 2022-12-17 11:56:48 +08:00
涓€绾跨伒|Deal 6d1e652213 Fix #983 2022-12-12 19:41:07 +08:00
RH 1a0612ca6e Move getWorldPosition() from Widget to Node class (#978) 
* Committing genbindings changes

* Move getWorldPosition() method to Node class to allow world position to be retrieved for any node.
 2022-12-07 09:24:46 +08:00
RH 2e30b51ab7 Add a pool for GroupCommand rendering commands (#969) 
* Committing genbindings changes

* Use a pool of GroupCommand entries to avoid multiple entries of the same group in the render queue in certain scenarios

* Ensure captureNode works as expected.

* Set member variables to default values when init method is called on the GroupCommand

* Explicitly reset the command state when retrieving a GroupCommand from the pool
 2022-11-28 08:37:22 +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
Vincent Lee 97f8a8d544 Replace use of deprecated sprintf with snprintf 2022-11-14 16:02:16 +09:00
halx99 17f5cd5543 Improve MFMediaPlayer state control 2022-11-14 11:35:38 +08: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
涓€绾跨伒|Deal 2084a1defb Fix http post with uri params 2022-11-08 13:15:00 +08:00
halx99 bfd96ae10a Improve memory use 2022-11-03 18:01:10 +08:00
RH 0649ab40df Force recalculation of normalized position when assigning new parent to node (#952) 
* Committing genbindings changes

* Ensure normalized position is re-calculated if parent node changes
 2022-11-03 15:49:34 +08:00
RH 82bcb1ae5f Add support for centered horizontal layout (#946) 
* Committing genbindings changes

* Add support for CENTER_HORIZONTAL layout type.
 2022-11-01 19:02:04 +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
halx99 65920b8f9d Fix ci 2022-11-01 16:02:13 +08:00
涓€绾跨伒|Deal 762e1b09c0 Update CCRenderer.h 2022-11-01 09:27:50 +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 d5a91886dc Fix ci warnings 2022-10-27 13:01:18 +08:00
halx99 9afa4a0255 Improve ax::Vector compiler compatible, also fix #933 2022-10-26 23:17:48 +08:00
halx99 84fe8f734a Update glad to v2.0.0 2022-10-25 09:01:57 +08:00
halx99 2c8347fcbc Remove unnecessary code 2022-10-24 22:42:34 +08:00
halx99 87000c35fc Add ETC2 support in pvr3ccz format 2022-10-24 19:06:49 +08:00
halx99 4fa40ee96b Validate shared VertexLayout from Shader Program 2022-10-20 20:22:28 +08:00
halx99 10ea947a50 Validate shared VertexLayout from Shader Program 2022-10-20 20:19:56 +08:00
halx99 04f5a9879d Fix memory leak 2022-10-20 20:18:32 +08:00
halx99 376941da91 Migrate 2022-10-18 19:17:36 +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 ba95ca98cf Update Device.h 2022-10-12 20:37:56 +08:00
halx99 8c18f962d5 馃敤Fix #887 2022-10-12 19:44:31 +08:00
halx99 ec72ebb697 Fix #873 2022-10-12 12:39:27 +08:00
aismann eb5058e6d0 /* axmol thread id */ (#924) 2022-10-12 07:04:36 +08:00
CHP 4d54f44f62 Update CMakeLists.txt (#922) 
* Update CMakeLists.txt

* Update CMakeLists.txt
 2022-10-12 07:04:01 +08:00
aismann 3ef8ac63f2 rename cocos2d to axmol (#920) 
* rename cocos2d to axmol

* rename cocos2d.h to axmol.h

* Update Physics3DTest.cpp

replace Sprite3D -> MeshRenderer
 2022-10-12 00:15:09 +08:00
CHP b3fa9381b5 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 9c7a876970 precompile_headers all platforms (#901) 2022-10-10 03:52:04 +08:00
涓€绾跨伒|Deal e9e7de0cea Improve AutoPolygon::generateTriangles performance (#905) 2022-10-09 18:06:15 +08:00
涓€绾跨伒|Deal 6f1c8d61d7 Add reasonable comment for performance code 2022-10-08 12:26:38 +08:00
aismann 49f7406f94 Improve MeshRenderer #879 thanks @solan-solan (#904) 
* Update Physics3DTest.cpp

Improve #879  thanks @solan-solan

* Update CCMeshRenderer.cpp

#hope this is fixing #879
 2022-10-08 06:15:03 +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 79925e07d6 Merge: 6cd36ab02e c26ab44880 
Merge pull request #801 from theunwisewolf/dev-richtext-scale-support

RichElementImage - Add support for scaling
 2022-10-04 11:08:49 +08:00
halx99 74ba83b711 Fix model render blend state, refer to: #879 2022-10-04 10:42:21 +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
RH eed2cde7d9 Fix to ensure Component::onEnter() is called (#867) 
* Committing genbindings changes

* Ensure that Component::onEnter() is called if component is added after parent onEnter has been called.

* Code style
 2022-09-27 17:32:04 +08:00
halx99 ad69ed003a Remove unnecessary APIs 2022-09-26 23:20:54 +08:00
halx99 8f41f8355c Change Program::getActiveAttributes retun type to reference 2022-09-24 11:38:41 +08:00
halx99 5c735619f9 Improve code style 2022-09-24 11:01:45 +08:00
halx99 82acade5b9 Improve code style 2022-09-24 10:42:11 +08:00
涓€绾跨伒|Deal cae2dd7820 Fix ci 2022-09-23 23:25:01 +08:00
halx99 3a9a26c743 Fix #861 2022-09-23 22:41:30 +08:00
涓€绾跨伒|Deal c693e54265 Update CCAutoPolygon.cpp 2022-09-19 18:22:34 +08:00
aismann e571e8242d Clipper2 v1 04 (#856) 
* Clipper2 v1.04 (and small fixes)

* Update README.md
 2022-09-19 14:17:13 +08:00
halx99 ea1b70288d Update thirdparty libs 
fmt: 9.0.0 --> 9.1.0
llhttp: 6.0.7 --> 6.0.9
astc-encoder: 4.0.0 --> 4.1.0
webp: 1.2.2 --> 1.2.4
flatbuffers: 2.0.0 --> 2.0.8
 2022-09-15 20:15:28 +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
aismann 9cecc6341c Update CCAutoPolygon.cpp 2022-08-27 18:30:22 +02:00
aismann c58b31d382 cleanup2 2022-08-27 17:41:12 +02:00
aismann ae349db909 cleanup 2022-08-27 17:40:03 +02:00
aismann 3bbbb0b2bf Replace Clipper1 (all stuff) 2022-08-27 17:00:10 +02:00
涓€绾跨伒 101afaa855 [CMake] Mark engine pch as private 2022-08-19 12:15:49 +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 a9933f877c Improve code style 2022-08-16 17:15:56 +08:00
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
DESKTOP-16GC0B8\813658 ff899d5511 Fixed get writable path for android 2022-08-13 23:53:40 +03:00
涓€绾跨伒 31289482d3 Revert "Support for Apple Silicon / M1" 2022-08-12 16:39:06 +08:00
unknown d71ad17f52 RichElementImage - Add support for scaling 2022-08-12 03:58:36 +05:30
halx99 1cd4bd42d3 Fix ci 2022-08-11 22:05:23 +08:00
halx99 b1287b8cc5 Migrate cmake files 2022-08-11 15:41:10 +08:00
halx99 8a348b8342 Fix #791 really 2022-08-11 10:52:38 +08:00
DelinWorks 72ec15f3ae Remove assign dups and simplify function naming. 2022-08-11 01:52:04 +03:00
Turky Mohammed 8d1cb27616 Update CCCamera.h [skip ci] 2022-08-10 21:10:34 +03:00
DelinWorks 895d2887fb Add initialize member function. 2022-08-10 21:09:10 +03:00
DelinWorks bc11f9f5fc Update CCCamera.cpp [skip ci] 2022-08-10 20:38:59 +03:00
DelinWorks 2e22040118 Fix camera view calculation and tidy up system 2022-08-10 20:14:18 +03:00
halx99 65b0690e55 Improve code style 
Refer to: https://github.com/cocos2d/cocos2d-x/pull/20743
 2022-08-10 21:08:51 +08:00
aismann 5d64474cfb rename push_back vs emplace_back (fine tuning and remove on Live2D (too much)) 2022-08-09 05:51:07 +02:00
涓€绾跨伒 9892aa3d1c Migrate axys (#782) 2022-08-08 18:02:17 +08:00
aismann 376c80dd2d Replace push_back() vs emplace_back() on axis/tests/cpp-tests and axis/core (#781) 
* Replace push_back() vs emplace_back() on axis\tests\cpp-tests\

D:\______\GitHub\aismann\axis\tests\cpp-tests\Classes
Replace Vector push_back() vs emplace_back() #762

* Replace push_back() vs emplace_back() on axis\core\ #781

* Update CCConsole.cpp

* Update UIWebViewImpl-android.cpp

* Update UIWebViewImpl-android.cpp
 2022-08-08 13:18:33 +08:00
halx99 9ce38e060b Improve android gradle utils 2022-08-07 09:26:56 +08:00
halx99 93550405bc Improve android gradle cmake & ndk setup 2022-08-06 23:09:16 +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
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
涓€绾跨伒 c6ff51e3be Fix #771 2022-08-02 21:48:16 +08:00
涓€绾跨伒 4dc1c53da8 Merge: df2cfe1490 797a41b469 
Merge pull request #769 from askamn/dev

Crashfix in UserDefault
 2022-08-02 21:11:33 +08:00
halx99 ce2494ea35 Fix android ci 2022-08-02 18:49:19 +08:00
unknown 8610fe4b7e Missed edge case when resizing the memorymapped file in UserDefault that could cause a crash 2022-08-02 16:13:12 +05:30
halx99 5a2ac3d34b Improve gradle script 2022-08-02 17:55:00 +08:00
unknown 85a4433395 closeKeyboard() method for EditBox 2022-08-02 03:02:35 +05:30
halx99 325fc583e9 Add more compatible macros to cocos2d.h [skip ci] 2022-07-26 22:50:51 +08:00