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

230 Commits

Author SHA1 Message Date
halx99 60cea769f9 string_view for apple 2021-12-28 11:48:48 +08:00
halx99 6bba4ce24b Merge: d397854ead 9eeeb151a1 
Merge commit
 2021-12-28 11:07:12 +08:00
halx99 c93849c6de Commit chnages 2021-12-28 11:05:34 +08:00
halx99 f905bf5c23 Committing clang-format changes 2021-12-28 03:00:34 +00:00
halx99 d0f7e06dfe string_view for osx 2021-12-28 10:49:14 +08:00
halx99 018be62678 string_view for android 2021-12-27 19:18:36 +08:00
halx99 5ba5049146 Huge changes for all string_view 2021-12-26 23:26:34 +08:00
halx99 8f83250ba4 Committing clang-format changes 2021-12-25 02:04:45 +00:00
halx99 1ee106007a Remove all unnecessary nothrow 2021-12-08 00:11:53 +08:00
halx99 554412f4fd Use struct `Vec2` instead `Size` 2021-10-23 23:27:14 +08:00
halx99 77404fd02a Code style 2021-10-11 12:15:41 +08:00
halx99 201fdcc2fb Fix #518 2021-10-06 18:45:58 +08:00
halx99 ba65bdfa32 Revert 'Remove callbackUniforms support" 2021-09-30 22:33:23 +08:00
halx99 b478425a2d Use more better typecast 2021-09-30 08:18:44 +08:00
halx99 5ef8402b59 Remove unused callbackUniforms 2021-09-30 08:18:01 +08:00
halx99 c3667c76f0 Fix #510 2021-09-30 08:16:33 +08:00
姒嗘煶鏉? 35b658c90e Merge: f5663f279c d73d937894 
Merge remote-tracking branch 'upstream/dev' into dev
 2021-09-05 20:45:32 +08:00
姒嗘煶鏉? 0aff165959 [fix]ScrollView and ListView goes back to the front incorrectly after calling doLayout. 2021-09-05 20:44:14 +08:00
rh101 e87384a4e2 Use %d for int32_t 2021-09-02 22:45:59 +10:00
rh101 5507b69fc0 Change %lu to %u 2021-09-02 22:43:10 +10:00
rh101 4e7db23d38 Remove getLong() method 
Change %du to %u, and %lx to %x
Use "stdint.h" instead of <cstdint> for TGAlib.h
 2021-09-02 20:30:20 +10:00
姒嗘煶鏉? 64e2cdd8d9 [fix]The problem of inaccurate maximum width limit when using system fonts. 2021-09-02 17:15:03 +08:00
rh101 eba8696d65 Change %ld to %d for 32bit data types 
Regenerate LUA bindings
 2021-09-02 17:46:22 +10:00
rh101 5c61f42990 Add required include for uint32_t 
Fix code warning
 2021-09-02 16:18:32 +10:00
rh101 d8fd94db8a Usage of long and unsigned long changed to platform independent fixed-sized types where appropriate. 2021-09-02 15:39:28 +10:00
halx99 73c5f887b5 Merge: 30625f2330 f5af50debd 
Merge pull request #475 from adxeproject/win64

Win64 build support [DONE] 馃殌馃帀
 2021-08-27 12:34:24 +08:00
aismann 147b4b7946 Update README.md 2021-08-27 06:25:18 +02:00
halx99 5d0565b900 Fix byteorder detect error for win64 and some warnings 2021-08-27 11:27:33 +08:00
halx99 4b7e098e65 Improve code quality 2021-07-16 11:04:38 +08:00
halx99 a97ba886bf Rename everything to adxe 2021-07-09 10:42:36 +08:00
halx99 ed3a0d05ec Move GL macros to backend MacrosGL.h 
a. Fix box2d-testbed crash on macos and ios
b. User should avoid use them at application
 2021-07-07 13:52:56 +08:00
halx99 10c1ed15ef Refactor dual sampler shader [ci build] 
Since not only etc1 could use sepreate RGB, A to two texture samplers, we unify the shader name.
 2021-06-27 20:58:50 +08:00
halx99 e5237503fb Fix #386 [ci build] 2021-06-17 22:22:41 +08:00
halx99 123a6555c9 Fix android astc support check 
glCompressedTexImage2D no error, regard the device support astc
 2021-06-10 16:42:57 +08:00
halx99 c53038448d Fix android compile error [ci build] 2021-06-10 14:17:47 +08:00
halx99 705ddf323c Fix ci [ci build] 2021-06-10 12:55:58 +08:00
halx99 0d492c5f76 Use 1px detect method for checking whether GPU support astc [ci build] 2021-06-10 12:44:34 +08:00
halx99 d0bb2a38a2 Fix ci [ci build] 2021-05-28 16:43:32 +08:00
halx99 571f639f0b Use type GLchar for glGetShaderInfoLog 2021-05-27 14:52:09 +08:00
halx99 7d0395ee26 Fix #360 2021-05-27 14:39:17 +08:00
rh101 95cf5b5c2b Merge: 2aa2d69151 b7506fed0c 
Merge branch 'vfs-support' of https://github.com/rh101/engine-x into vfs-support
 2021-04-23 00:01:47 +10:00
rh101 54ffa13dff Move PosixFileStream class to its own files 
Update UserDefault to work with FileStream
Fix undefined openFileStream on platforms other than Win32
 2021-04-23 00:01:32 +10:00
RH 1e15ed4839 Merge: 2cef9f2e76 844119d162 
Merge pull request #3 from c4games/master

Sync with master
 2021-04-22 21:48:49 +10:00
rh101 7540c06fd3 Use FileStream to write JPG images to disk 2021-04-22 21:36:26 +10:00
halx99 8ed6d34234 Explicit set cmake minimum version at app/build.gradle [ci build] 2021-04-22 11:40:53 +08:00
rh101 2bf12b2226 Add support for virtual file system via custom FileStream and FileUtils implementations. 2021-04-22 03:15:49 +10:00
halx99 6904b9f3f3 Fix depth stencil state/desc (#321) 
* Fix ds state

* fix 3d object not render

* Update DepthStencilStateGL.cpp

* fix ds, not complete

* fix image ref incorrect

* Fix metal captureScreen

* Share ds desc
needs restore properly after non-default render target destroy.

* fix gl compile

* Sync ds desc

* Only set vertex & index buffer once for batch draw

* Add set/get ds desc for renderer

* Refine code style

* Fix RenderTextureTest
a. should restore stencil desc properly

* Sync gl captureNode

* Sync GL
 2021-01-31 22:22:52 +08:00
halx99 03e130a19f Revert "Fix #313" 2021-01-21 12:41:01 +08:00
halx99 734602069e Fix #313 
a. error: depthAttachment PixelFormat (MTLPixelFormatInvalid) and stencilAttachment PixelFormat (MTLPixelFormat Depth32Float_Stencil8) must match.
b. Because we only support D24S8(D32FS8) combined format, so needs check
TargetBuffferFlags::DEPTH_AND_STENCIL when setup depth and stencil
format, otherwise newRenderPipelineWithDescriptor will crash.
 2021-01-16 00:01:21 +08:00
halx99 984c164c57 Sync yasio to 3.35.0 [ci build] 2020-12-21 18:12:13 +08:00