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

94 Commits

Author SHA1 Message Date
rh101 c3618f8ea6 Extract real target from ALIAS if it exists in order to set property successfully 
Remove duplicate entries in dependencies lists
 2021-05-05 16:04:06 +10:00
halx99 0511520281 Merge: 7f1ca55a97 1efe0091a8 
Merge pull request #347 from rh101/imgui-fix

ImGUI font crash fix when using virtual file system
 2021-04-27 23:29:22 -07:00
rh101 e5fa398c67 Load fonts into IMGUI using memory routines rather than allowing it to use its own file handling in order to support FileStream related implementations. 2021-04-28 15:53:37 +10:00
rh101 13115cc789 Let the OGG function overrides handle freeing memory of the FileStream pointer. 2021-04-26 17:30:18 +10:00
rh101 3281c7349a Clear unique_ptr with reset(). 2021-04-26 15:46:59 +10:00
rh101 b923b1a678 Use reset() to clear unique_ptr. 
Use value initialization for unique_ptr.
Change AudioDecoderOgg override functions to use FileStream* instead of unique_ptr.
Remove redundant code.
 2021-04-26 15:43:33 +10:00
rh101 668e96cadd Use unique_ptr for FileUtils::openFileStream 
Fix OGG audio playback due to incorrect tell() method
Fix unzip close() override method not deleting FileStream pointer.
 2021-04-26 14:21:56 +10:00
RH 5b168e3bb6 Merge: 03bb24f313 85c5705f48 
Merge branch 'vfs-support' into master
 2021-04-26 10:39:09 +10:00
RH 0e2247a2d9 Merge: d1027ab263 ce6117fa65 
Merge pull request #7 from c4games/master

Sync with primary
 2021-04-26 10:32:25 +10:00
rh101 833f27f499 Ensure code uses FileStream::tell() to get size if required after using FileStream::seek(0, SET_END) 2021-04-26 10:28:33 +10:00
rh101 e6990d0b36 Remove unnecessary method call to close FileStream 2021-04-26 08:55:07 +10:00
halx99 be9bd61131 Fix tool script cocos 2021-04-25 09:22:07 -07:00
rh101 fa4ed8a975 Initialise member variable 2021-04-26 01:05:06 +10:00
rh101 155fe98406 openFileStream now returns a nullptr if it fails 2021-04-24 09:22:27 +10:00
RH dd5f77c3d5 Merge: 15c8f2298d 0886473e1b 
Merge pull request #4 from rh101/master

Sync with master
 2021-04-22 21:49:43 +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 b999d86597 Improve win dll support 2020-10-06 16:46:38 +08:00
halx99 cca0739793 Refactor pixel format manipulate (#217) 
* PixelFormat use table

* Correct PixelFormat name to match 'GL_LUMINANCE'

* Up

* fix cube update texture enum

* linux build

* Refine ci

* fix linux build

* Remove unused function, match mtl framebuffer pixel format

* readPixels always RGBA format

* fix ci for linux

* fix linux build

* Remove unused functions

* fix travis

* fix android ci

* Update config.json

* linux glad

* Update CCGLViewImpl-desktop.cpp

* fix linux build

* Fix linux build

* Link issue [skip appveyor][skip travis]

* Update CMakeLists.txt

* Refine GL enums use

* Update test case name [skip appveyor][skip travis]

* fix linux link issue

* for mtl

* fix ci

* Tidy pixelformat enums

* fix ci

* fix rgba8 to abgr4 error

* fix ci

* fix ci for GLES

* Fix linux build, require glibc-2.27+

* Use properly dist for travis [skip appveyor]

* fix linux build [skip appveyor]

* Update install-deps-linux.sh

* Remove unused members for pixel block info, update external to v73

* Sync from compile linux warnings

* Remove unused check, and PixelFormat::A8 is ordinary format, not compressed format

* metal doesn't support rgb8 (#3)

* Update CCTexture2D.cpp

* Refine code

* Pixel Format Descriptor Table

* fix ci

* BGR5A1

* Simplfy texture format convert function name

* Update

* rgba4 match mtl render format

* Add note about RGBA4

* Remove unused function

* fix osx

* Already converted at texture2d

* Clearly comment

* fixup
 2020-09-25 11:07:56 +08:00
halx99 54f1fc26d6 fix mac compile error 2020-09-05 22:33:18 +08:00
halx99 ea1cb45ba3 Refine code style 2020-08-27 10:19:21 +08:00
halx99 6ac06d8571 fix ci compile 2020-08-27 00:49:07 +08:00
halx99 c9d6c5afdf Rename PXFileStream to CCFileStream 2020-08-27 00:21:44 +08:00
halx99 c8a665da40 Update al format enum 2020-08-24 19:04:08 +08:00
halx99 34c51f5596 Print al vender and version after initialized 2020-08-20 22:37:34 +08:00
halx99 bda3a720b4 Use CC0-1.0 licensed decoder 'minimp3' to replace LGPL licensed decoder 'mpg123' 2020-08-17 14:56:53 +08:00
halx99 08e3b65b9a More clearly check supported pcm format by alsoft extends 2020-08-15 17:48:57 +08:00
halx99 2e4499b6d0 Add ios framework required by SDL2, check whether SDL2 support strip it later 2020-08-15 17:47:40 +08:00
halx99 072deafeae Adapte zlib licensed AL library: mojoal 2020-08-14 18:58:44 +08:00
halx99 f72f6e8cac Cleanup unused code for min support iOS 2020-08-13 23:03:55 +08:00
halx99 a09253c7a2 fix-157 2020-08-13 22:35:41 +08:00
halx99 a3b208075b fix compile issue without alsoft 2020-08-13 00:41:30 +08:00
halx99 da2ec96fd8 fix ci android build issue. 2020-08-12 18:53:33 +08:00
halx99 5732e20789 Tidy code 2020-08-12 18:40:04 +08:00
halx99 d9ef1e238f Simplify audio source again, merge audio sources 2020-08-12 17:00:07 +08:00
halx99 247cb83b18 fix #127 2020-07-31 17:23:03 +08:00
halx99 2a2b397f27 Add alconfig.h to choose whether use openal-soft 2020-07-31 17:03:58 +08:00
halx99 65bb368cc2 Add missing detect macro CC_USE_ALSOFT_ON_APPLE on apple platform 2020-07-31 16:36:45 +08:00
halx99 c17ea9fdd5 Update comment [skip appveyor] [skip travis] 2020-07-31 15:49:50 +08:00
halx99 bcd1c17aa5 Tidy audio source, unify headers: AudioEngineImpl.h AudioPlayer.h 2020-07-31 14:32:08 +08:00
halx99 bef47490e0 Refine message output [skip travis] [skip appveyor] 2020-07-31 11:35:52 +08:00
halx99 14e090f9bf fix option order 2020-07-31 11:22:42 +08:00
halx99 77f9757d4d [Audio] Use apple system decoder for non .ogg audio files 2020-07-31 00:31:39 +08:00
halx99 9345f18159 Add CMAKE option CC_USE_ALSOFT_ON_APPLE to use kcat openal-soft on apple platform, by default currently OFF 2020-07-31 00:06:59 +08:00
halx99 3608150968 Use std::vector<char> to manage pcmData buffer on AudioCache, remove unused source from AudioCache.mm 2020-07-30 18:09:50 +08:00
halx99 72dcc33747 Fix dead-lock when play/stopAll immidiately 2020-07-30 17:26:54 +08:00
halx99 a2800e0144 Sync missing fixs from v3, see: https://github.com/cocos2d/cocos2d-x/pull/19240 2020-07-30 17:07:38 +08:00
halx99 9b57ed3781 [Audio] Improve mutex use 2020-06-04 23:11:24 +08:00