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

314 Commits

Author SHA1 Message Date
DelinWorks 7b829e6cff Use CCASSERT instead. 2022-07-01 05:54:20 +03:00
DelinWorks 8cfbbd75f1 Update CCRenderer.cpp 2022-07-01 04:06:26 +03:00
DelinWorks 5d4b78f9b4 [skip ci] 2022-07-01 03:39:27 +03:00
DelinWorks b6a80ab5b6 Fix get default camera nullptr on scene initialization. 2022-07-01 03:34:37 +03:00
DelinWorks 28125465d0 Fix typos. [skip ci] 2022-06-30 23:21:21 +03:00
DelinWorks 8485ece883 Update BufferGL.h 2022-06-30 22:43:56 +03:00
DelinWorks f506e43c67 Update BufferGL.h 2022-06-30 22:26:02 +03:00
DelinWorks 35bd10e707 Add UINT mesh index format support. 2022-06-30 21:44:37 +03:00
halx99 0707b47256 Try fix fps 2022-07-01 01:00:18 +08:00
涓€绾跨伒 b0504b4dd3 Update CCDirector.cpp 2022-06-30 21:06:39 +08:00
涓€绾跨伒 6d2bc9bbf2 Revert "Unify frame rate control logical to director mainLoop" 2022-06-30 21:04:00 +08:00
涓€绾跨伒 5ef42d4e39 Merge: 42fc96bdac 3d1690cc25 
Merge pull request #681 from adxeproject/refactor-layer-new

Use sprite to implement layer color for auto batch draw
 2022-06-30 20:13:30 +08:00
涓€绾跨伒 118c1af907 Merge: 752d3150eb f52bc9472d 
Merge pull request #682 from aismann/poly2tri

poly2tri:  Version: git 81612cb  (until May 20, 2022)
 2022-06-30 19:07:49 +08:00
halx99 adb0a67ba8 Add missing autorelease call 2022-06-30 18:18:24 +08:00
halx99 32f3777128 Fix ci 2022-06-30 18:15:43 +08:00
aismann 9f060fbd99 Version: git 81612cb (until May 20, 2022) 2022-06-30 12:13:55 +02:00
halx99 502d80ede1 Use sprite to implement layer color for auto batch draw 2022-06-30 18:01:29 +08:00
halx99 8314777449 Improve code style 2022-06-30 12:05:28 +08:00
halx99 644f09d5a3 Improve frame rate control 2022-06-29 17:26:22 +08:00
涓€绾跨伒 6d1a2e70e7 Merge: 040a64b920 884a4c3b1d 
Merge pull request #675 from adxeproject/unify-fps-limit

Unify frame rate control logical to director mainLoop
 2022-06-28 17:33:00 +08:00
涓€绾跨伒 8b42852d1f Delete unused comment [skip ci] 2022-06-28 17:14:35 +08:00
涓€绾跨伒 614397d0f4 Merge: 7f795d7a6c c6c07428bf 
Merge pull request #677 from rh101/rendertarget-fix

Make the render target selectable for RenderTexture
 2022-06-28 16:39:59 +08:00
halx99 f8c036e621 Improve frame rate control precision 2022-06-28 16:33:50 +08:00
rh101 75d1bf196a Ensure the render target is released if it is already set, since the initWithWidthAndHeight method may be called multiple times. 2022-06-28 17:56:17 +10:00
rh101 62af2299a6 Allow the selection of a shared or new render target for each instance of RenderTexture 
Add a method to check if the RenderTexture is using a shared render target
 2022-06-28 17:42:33 +10:00
halx99 7417447fc7 Fix ci 2022-06-28 15:03:35 +08:00
halx99 5db31e4125 Unify fps control logical to director mainLoop 2022-06-28 12:39:05 +08:00
halx99 cb8123e7a7 Improve GPUTextureFormat info enums 2022-06-27 15:37:55 +08:00
涓€绾跨伒 9593275451 Merge: 5ffae45e2d aa372510a4 
Merge pull request #653 from DelinWorks/camera-2d-zoom-feature

[PROPOSAL] Add camera zoom, near, far, fov, aspect features & fix camera anchoring.
 2022-06-25 10:15:31 +08:00
halx99 c25552c1b7 Improve code style 2022-06-25 00:36:50 +08:00
halx99 ee3605c991 Improve renderer 2022-06-24 14:18:48 +08:00
涓€绾跨伒 767126e854 glGetTexImage only supported by Natvie GL 2022-06-22 19:09:45 +08:00
halx99 4cf6c52cf4 string_view 2022-06-20 01:49:50 +08:00
DelinWorks e37d8f9cfd Use the simple version of create orthographic. 2022-06-17 21:33:06 +03:00
DelinWorks 4b2285353e Modify orthographic projection rather than scale. 
Modify the orthographic projection of the camera rather than the scale of the Node when in 2D projection.
 2022-06-17 21:25:33 +03:00
DelinWorks 2de02067d3 flag camera as Initialized in custom create functions. 2022-06-17 20:41:38 +03:00
halx99 61956d8dd6 Refine enum `Platform` defination to avoid conflict with system macro 
refer to: #661
 2022-06-17 22:18:26 +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
DelinWorks 6f34e1d96f GitHub being frustrating as always :/ 2022-06-16 19:42:37 +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 b1b67564f1 Revert "Fix things..." 
This reverts commit 038fca48e1.
 2022-06-16 19:39:58 +03:00
DelinWorks 1be0a1c99b Fix things... 2022-06-16 19:38:44 +03:00
DelinWorks 44feb1d398 Revert "Revert! dumb idea." 
This reverts commit 7969deb02a.
 2022-06-16 19:32:52 +03:00
DelinWorks 5816529d9a Revert! dumb idea. 2022-06-16 19:31:17 +03:00
DelinWorks ae5d45a9c3 Fix enum class confliction & clean up types. 2022-06-16 18:48:53 +03:00
DelinWorks fd4bfb0fd5 Apply orthographic zoom values non-destructively. 2022-06-16 16:41:40 +03:00
涓€绾跨伒 c49442229e Merge: 7fd2fd6dac 2e3c84252d 
Merge pull request #639 from DelinWorks/partical-system-animation

[PROPOSAL] Add Particle System Animations And Improvements
 2022-06-16 21:18:57 +08:00
halx99 4301448ba4 Set default encoding to UTF-8 [skip ci] 2022-06-16 21:18:31 +08:00
DelinWorks 5491ca8e6e Remove useless functions. 2022-06-16 16:16:19 +03:00
DelinWorks ee6d7d374e Add fourccId support. 2022-06-16 15:25:43 +03:00
Turky Mohammed fc2ff5003f Update CCParticleSystem.h 2022-06-16 14:13:59 +03:00
涓€绾跨伒 3f09748e03 Update version [skip ci] 2022-06-16 19:00:51 +08:00
halx99 51b6e5391f Fix ci, astc only support sse2 for x86 target 2022-06-16 12:22:39 +08:00
Turky Mohammed 233b1372de Update RngSeed.hpp [skip ci] 2022-06-16 05:23:41 +03:00
Turky Mohammed 269cc85453 Update RngSeed.hpp [skip ci] 2022-06-16 05:14:56 +03:00
DelinWorks d85aa026e0 extract RngSeed struct to it's separate class. [skip ci] 2022-06-16 05:01:35 +03:00
DelinWorks c5eb8db573 Fix fixed fps move stuttering. 2022-06-16 03:55:46 +03:00
DelinWorks ebbafbd938 Add function versioning. [skip ci] 2022-06-16 00:47:19 +03:00
DelinWorks 73b29e235e Add cpp_tests and improve system. 2022-06-15 23:04:08 +03:00
halx99 5c9ab14d3e Fix astc cmake simd check for windows x64 2022-06-15 21:16:51 +08:00
DelinWorks 82722eefc2 Fix rotation override and node base class calls. 
Make sure Node class calls it's base functions and NOT the ones overridden when changing position, and make sure the rotation set for the camera isn't altered when calling applyCustomProperties().
 2022-06-15 16:10:47 +03:00
aismann a0dfe6e2ab SimpleSnake small updates 
- CodeCleanup
- MIT License file
- readme update
 2022-06-15 07:02:08 +02:00
Turky Mohammed db6ea424ea Remove useless code and comments. [skip ci] 2022-06-15 05:25:40 +03:00
DelinWorks a15572d08a Fix rotation update & reference deduction. 2022-06-15 05:00:17 +03:00
DelinWorks 2886ada2b6 Fix orthogonal apply custom positioning. [skip ci] 2022-06-15 03:55:57 +03:00
DelinWorks 14666d9c1f Add position rotation setters & getters override for custom behaviors. 2022-06-15 03:48:26 +03:00
halx99 ce63a440ef Take care glGetTexImage func pointer check 2022-06-14 15:33:42 +08:00
涓€绾跨伒 b9bc6b7357 cocos2dVersion compatible (#655) 
* cocos2dVersion compatible

* Update [skip ci]
 2022-06-14 13:33:45 +08:00
DelinWorks ed7f8c2929 Update CCCamera.cpp [skip ci] 2022-06-14 02:11:40 +03:00
DelinWorks 3e98101dc4 Improve system and fix near plane zoom in. 2022-06-14 01:53:35 +03:00
DelinWorks 9ddbab21a9 Fix other platforms compilation. 2022-06-13 21:33:23 +03:00
DelinWorks a9f2e29ebf Add zoom and camera features. 2022-06-13 21:04:24 +03:00
涓€绾跨伒 010172e659 Fix typo [skip ci] 2022-06-13 15:44:25 +08:00
halx99 e3f0f29d1a Improve code style 2022-06-13 14:28:09 +08:00
halx99 864601764f Improve code style 2022-06-13 12:46:40 +08:00
halx99 2877a7eb78 Improve code style 2022-06-13 09:45:33 +08:00
halx99 aa5d3b65e0 Improve code style 2022-06-13 09:26:10 +08:00
Turky Mohammed 11c21ddde4 Merge: 31dcd4eb25 bd2cff3dfd 
Merge branch 'adxeproject:dev' into partical-system-animation
 2022-06-13 00:10:42 +03:00
涓€绾跨伒 9b50a8e8c3 Improve text rendering (#652) 
* Improve text-rendering
a. Separate outline texture data upload for GL and Metal backend
b. Fix memory leak of FontAtlas::_currentPageDataRGBA
b. Add FontFreeType::setMissingGlyphCharacter for rendering a missing char
d. Improve FontFreetype::renderCharAt with memcpy
 2022-06-13 01:44:31 +08:00
涓€绾跨伒 faf0038a53 Update install-deps-linux.sh 2022-06-13 01:13:08 +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 f6c390296d Add in-between fill in. 2022-06-12 15:57:11 +03:00
DelinWorks 95b8cd80ef Add comments. 2022-06-12 15:36:25 +03:00
DelinWorks 8d1e3fccf4 Emplace dummy masks to container. 2022-06-12 15:15:51 +03:00
DelinWorks 4f5bcc797d Cleanup and add performance logs. 
Somehow not using const reference takes 30 fps away 馃槙
 2022-06-12 03:40:13 +03:00
DelinWorks 191d55433d what? [skip ci] 2022-06-12 03:10:49 +03:00
DelinWorks c4b2177137 Avoid unnecessary copying of memory. 2022-06-12 02:44:27 +03:00
DelinWorks 49a01563d7 Add emission mask transformations support. 2022-06-12 02:16:15 +03:00
DelinWorks 853b8601d0 Fix RANDOM_KISS rounding crash. 2022-06-12 01:39:11 +03:00
DelinWorks ce6da8c562 Fix RANDOM_KISS 1.0F Bias 2022-06-12 01:32:29 +03:00
DelinWorks c241edab27 Add emission mask support. 2022-06-12 00:58:01 +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 0462dbea43 Fix #651 2022-06-11 17:58:02 +08:00
涓€绾跨伒 03c8056078 Merge: 5138d701d6 5c35eda3b9 
Merge pull request #650 from adxeproject/ndk-r23c

Upgrade android toolsets to ndk-r23c LTS
 2022-06-11 16:57:37 +08:00
halx99 89c075f679 Fix ci 2022-06-11 16:21:47 +08:00
halx99 9bf295d8e4 Upgrade android toolsets 
- ndk to r23c
- gradle plugin to 7.2.0
- gradle wrapper to 7.4.2
- config ndk ver at adxetools.gradle
 2022-06-11 16:16:47 +08:00
halx99 ddc1a80420 Delete unused comment 2022-06-11 15:30:51 +08:00
halx99 1e33f4ce7b Fix ci 2022-06-11 10:14:32 +08:00
halx99 9d91b7837d Fix #648, remove GB2312 charset handle, only support UNICODE font 2022-06-11 09:50:07 +08:00