mirror of
https://github.com/SpartanJ/eepp.git
synced 2026-08-18 06:55:48 +03:00
Migrated to Github (remove hg stuffs, added git submodules).
Fixed compilation (SoundFileReaderFlac needed some updateds). Updated README.md.
This commit is contained in:
Martín Lucas Golini
6
.gitmodules
vendored
Normal file
6
.gitmodules
vendored
Normal file
@@ -0,0 +1,6 @@
|
||||
[submodule "src/thirdparty/efsw"]
|
||||
path = src/thirdparty/efsw
|
||||
url = https://github.com/SpartanJ/efsw
|
||||
[submodule "src/thirdparty/SOIL2"]
|
||||
path = src/thirdparty/SOIL2
|
||||
url = https://github.com/SpartanJ/soil2
|
||||
60
.hgignore
60
.hgignore
@@ -1,60 +0,0 @@
|
||||
syntax: regexp
|
||||
^fonts$
|
||||
^assets/temp$
|
||||
^obj$
|
||||
^libs$
|
||||
^make$
|
||||
^data$
|
||||
^docs/doxygen-html$
|
||||
^docs/html$
|
||||
^docs/rst$
|
||||
^docs/xml$
|
||||
^docs/doxyrest/sphinx/__pycache__$
|
||||
^projects/android-project/.gradle$
|
||||
^projects/android-project/build$
|
||||
^projects/android-project/local.properties$
|
||||
^projects/android-project/app/.externalNativeBuild$
|
||||
^projects/android-project/app/build$
|
||||
^projects/android-project/app/src/main/assets$
|
||||
^projects/android-project-ant/bin$
|
||||
^projects/android-project-ant/obj$
|
||||
^projects/android-project-ant/data$
|
||||
^projects/android-project-ant/gen$
|
||||
^projects/android-project-ant/assets$
|
||||
^projects/android-project-ant/libs$
|
||||
^src/examples/strobe$
|
||||
.*.dll
|
||||
eees*
|
||||
eeew*
|
||||
eetest*
|
||||
eesound*
|
||||
eesprite*
|
||||
eefonts*
|
||||
eevbo-fbo-batch*
|
||||
eephysics*
|
||||
eestrobe*
|
||||
eeiv*
|
||||
eehttp-request*
|
||||
eepp-TextureAtlasEditor*
|
||||
eepp-UIEditor*
|
||||
ee.tag
|
||||
log.log
|
||||
external_projects.lua
|
||||
.*\.user$
|
||||
.*\.filters$
|
||||
.*\.suo$
|
||||
.*\.DS_Store$
|
||||
.*.pdb$
|
||||
syntax: glob
|
||||
src/thirdparty/SDL2/include/SDL2
|
||||
projects/ios/eepp.app/assets
|
||||
projects/ios/eepp.app/eepp
|
||||
bin/libeepp-debug.dylib
|
||||
bin/libeepp.dylib
|
||||
bin/eeui-hello-world*
|
||||
bin/eepp-MapEditor*
|
||||
*.iml
|
||||
.idea
|
||||
eepp.kdev4
|
||||
eepp.tags
|
||||
eepp.geany
|
||||
126
README.md
126
README.md
@@ -201,7 +201,8 @@ UI Screenshots
|
||||
|
||||
UI Layout XML example
|
||||
---------------------
|
||||
It should look really familiar to any Android developer. This is a window with the most basic controls in a vertical linear layout display.
|
||||
It should look really familiar to any Android developer. This is a window with
|
||||
the most basic controls in a vertical linear layout display.
|
||||
|
||||
```xml
|
||||
<window layout_width="300dp" layout_height="300dp" winflags="default|maximize">
|
||||
@@ -237,8 +238,9 @@ UITextView::New()->setText( "Text on test 1" )
|
||||
|
||||
UI Styling
|
||||
----------
|
||||
Element styling can be done with a custom implementation of Cascading Style Sheets, most common CSS2 rules are available,
|
||||
plus several CSS3 rules (some examples: [transitions](https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_Transitions),
|
||||
Element styling can be done with a custom implementation of Cascading Style
|
||||
Sheets, most common CSS2 rules are available, plus several CSS3 rules (some
|
||||
examples: [transitions](https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_Transitions),
|
||||
[custom properties](https://developer.mozilla.org/en-US/docs/Web/CSS/Using_CSS_custom_properties),
|
||||
[media queries](https://developer.mozilla.org/en-US/docs/Web/CSS/Media_Queries/Using_media_queries),
|
||||
[@font-face at rule](https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face),
|
||||
@@ -318,18 +320,34 @@ Here is a small example on how the CSS looks like:
|
||||
```
|
||||
|
||||
|
||||
How can I learn to use the library?
|
||||
-----------------------------------
|
||||
This is the current big issue with the library. Since I'm solo working, it's really difficult keep up the documentation updated. But I'll work to improve that in the near future. For the moment you have two options: build the documentation and read code examples. The documentation is not complete but most modules are documented. Sadly not the UI module ( the biggest one ), but it's easy to get along with the examples. The library is supper easy to use, but is kind of big, so, knowing about everything I'll take time. I you're interested you can contact me anytime.
|
||||
Documentation
|
||||
-------------
|
||||
Documentation is located [here](https://eepp.ensoft.dev). I'm currently working
|
||||
on improving it. About 50% of the project is currently documented so still needs
|
||||
a lot of work. Please check the code examples located in `src/examples` and you
|
||||
can also check out the test ( `src/test` ) and tools ( `src/tools` ).
|
||||
I'm putting my efforts on improving the documentation on the UI module since
|
||||
currently is the most important and complex module but lacks of proper
|
||||
documentation. If you have any question you can contact me anytime.
|
||||
|
||||
Getting the code
|
||||
----------------
|
||||
The repository uses git submodules so you'll need to clone the repository and
|
||||
its submodules, in order to achieve this easily you can simply clone with:
|
||||
`git clone --recurse-submodules https://github.com/SpartanJ/eepp.git`
|
||||
|
||||
How to build it?
|
||||
----------------
|
||||
|
||||
The library has very few external dependencies. Most of the time you will only need SDL2 and OpenAL libraries with the headers installed. Also **premake4** or **premake5** is needed to generate the Makefiles or project files to build the library. I will assume that you know what you are doing and skip the basics.
|
||||
The library has very few external dependencies. Most of the time you will only
|
||||
need SDL2 and OpenAL libraries with the headers installed. Also **premake4** or
|
||||
**premake5** is needed to generate the Makefiles or project files to build the
|
||||
library. I will assume that you know what you are doing and skip the basics.
|
||||
|
||||
_**GNU/Linux**_
|
||||
|
||||
In a Ubuntu system it would be something like ( also you will need gcc and freetype, but it will be installed anyways ):
|
||||
In a Ubuntu system it would be something like ( also you will need gcc and freetype,
|
||||
but it will be installed anyways ):
|
||||
|
||||
`sudo apt-get install premake4 libsdl2-2.0-0 libsdl2-dev libopenal1 libopenal-dev`
|
||||
|
||||
@@ -346,7 +364,9 @@ That's it. That will build the whole project.
|
||||
_**Windows**_
|
||||
|
||||
You have two options: build with *Visual Studio* or with *mingw*.
|
||||
To build with any of both options first you will need to build the project files with [premake4](https://premake.github.io/download.html). Then add the premake4.exe file to any of the executable paths defined in `PATH` ( or add one ).
|
||||
To build with any of both options first you will need to build the project files
|
||||
with [premake4](https://premake.github.io/download.html). Then add the
|
||||
premake4.exe file to any of the executable paths defined in `PATH` ( or add one ).
|
||||
|
||||
For *Visual Studio*:
|
||||
`premake5.exe vs2019`
|
||||
@@ -356,20 +376,29 @@ or
|
||||
For *mingw*:
|
||||
`premake4.exe gmake`
|
||||
|
||||
Then you will need the prebuild binaries and development libraries of [SDL2](http://libsdl.org/download-2.0.php) and [openal-soft](http://kcat.strangesoft.net/openal.html#download). Download the ones needed ( *VS* or *mingw* ).
|
||||
Then you will need the prebuild binaries and development libraries of
|
||||
[SDL2](http://libsdl.org/download-2.0.php) and
|
||||
[openal-soft](http://kcat.strangesoft.net/openal.html#download).
|
||||
Download the ones needed ( *VS* or *mingw* ).
|
||||
|
||||
Then the project files should be found in `make/windows/`. A solution (sln) for *Visual Studio* or the corresponding `Makefiles` for *mingw*.
|
||||
Then the project files should be found in `make/windows/`. A solution (sln) for
|
||||
*Visual Studio* or the corresponding `Makefiles` for *mingw*.
|
||||
|
||||
Having installed everything, you'll be able to build for *Visual Studio* as any other project.
|
||||
Having installed everything, you'll be able to build for *Visual Studio* as any
|
||||
other project.
|
||||
And for *mingw* just make the project with: `mingw32-make` or any equivalent.
|
||||
|
||||
_**macOS**_
|
||||
|
||||
You have two options to build the project: with XCode or with gcc/clang manually.
|
||||
To build with any of both options first you will also need to build the project files with [premake4](https://premake.github.io/download.html).
|
||||
Then you will need the prebuild binaries and development libraries of [SDL2](http://libsdl.org/download-2.0.php), OpenAL is included with the OS. Install the *SDL2* framework and you should be able to build the project.
|
||||
To build with any of both options first you will also need to build the project
|
||||
files with [premake4](https://premake.github.io/download.html).
|
||||
Then you will need the prebuild binaries and development libraries of
|
||||
[SDL2](http://libsdl.org/download-2.0.php), OpenAL is included with the OS.
|
||||
Install the *SDL2* framework and you should be able to build the project.
|
||||
|
||||
For a CLI build you can use the `projects/osx/make.sh` script, that generates the *Makefiles* and builds the project, also fix the dylibs generated.
|
||||
For a CLI build you can use the `projects/osx/make.sh` script, that generates
|
||||
the *Makefiles* and builds the project, also fix the dylibs generated.
|
||||
|
||||
For *XCode* :
|
||||
`premake4 xcode4`
|
||||
@@ -379,40 +408,73 @@ And open the XCode project generated in `make/osx/`
|
||||
|
||||
_**Android**_
|
||||
|
||||
There's a gradle project in `projects/android-project/`. It will build the library with all the dependencies included. Use the example project as a base for your project. Notice that there's a `eepp.mk` project file that builds the library. That can be used in you projects.
|
||||
There's a gradle project in `projects/android-project/`. It will build the
|
||||
library with all the dependencies included. Use the example project as a base
|
||||
for your project. Notice that there's a `eepp.mk` project file that builds the
|
||||
library. That can be used in you projects.
|
||||
|
||||
_**iOS**_
|
||||
|
||||
I've compiled the project for *iOS* many times in the past but there's not a recent build of it, so it might fail. But you can get the scripts to build it in `projects/ios/`. You'll need some inspiration to make this work, but i promise that i'll work on make this easier in the near future.
|
||||
I've compiled the project for *iOS* many times in the past but there's not a
|
||||
recent build of it, so it might fail. But you can get the scripts to build it in
|
||||
`projects/ios/`. You'll need some inspiration to make this work, but i promise
|
||||
that i'll work on make this easier in the near future.
|
||||
|
||||
_**emscripten**_
|
||||
|
||||
There's a script for building the *emscripten* project in `projects/emscripten/make.sh`. That should be enough in *GNU/Linux* or *macOS* ( only tested this on *Linux* ).
|
||||
There's a script for building the *emscripten* project in
|
||||
`projects/emscripten/make.sh`. That should be enough in *GNU/Linux* or *macOS*
|
||||
( only tested this on *Linux* ).
|
||||
|
||||
Author comment
|
||||
--------------
|
||||
The library has been being developed for several years, it suffered many changes since its beginnings,
|
||||
I'm making any changes that I find necessary to improve it, so the API still not totally stable (but close to be).
|
||||
It's being used in several applications oriented to publicity campaigns mostly developed for Android devices and Windows PCs.
|
||||
I personally never had the time to use it to develop a real game with the library ( several frustrated projects ).
|
||||
The current project focus is on the UI module. And I'll continue working putting my focus on this.
|
||||
The plan is to provide an alternative UI toolkit fully hardware accelerated similar to the Android toolkit but simpler ( as in easy to use ) and also oriented to desktop apps.
|
||||
The library has been being developed for several years, it suffered many changes
|
||||
since its beginnings, I'm making any changes that I find necessary to improve
|
||||
it, so the API is still not totally stable (but close to be).
|
||||
It's being used in several applications oriented to publicity campaigns mostly
|
||||
developed for Android devices and Windows PCs.
|
||||
I personally never had the time to use it to develop a complex game with the
|
||||
library ( several frustrated projects ), but I made several UI oriented games
|
||||
for clients.
|
||||
The current project focus is on the UI module. And I'll continue working
|
||||
putting my focus on this.
|
||||
The plan is to provide an alternative UI toolkit fully hardware accelerated
|
||||
similar to the Android toolkit but simpler ( as in easy to use ) and also
|
||||
oriented to desktop apps.
|
||||
|
||||
Audio and Network modules were based the modules in SFML with several important differences mentioned above.
|
||||
I like to use what's well done and fit my needs, but since I have my personal views on how to implement some things I prefer to take the code, to have full control over it.
|
||||
Also many ideas were/are taken from other projects. Some I can think about: *cocos2d-x*, *raylib*, *Android SDK*, *libgdx*, *Godot*, *XNA*, *LÖVE*, and many other projects.
|
||||
Audio and Network modules were based the modules in SFML with several important
|
||||
differences mentioned above.
|
||||
I like to use what's well done and fit my needs, but since I have my personal
|
||||
views on how to implement some things I prefer to take the code, to have full
|
||||
control over it.
|
||||
Also many ideas were/are taken from other projects. Some I can think about:
|
||||
*cocos2d-x*, *raylib*, *Android SDK*, *libgdx*, *Godot*, *XNA*, *LÖVE*, and many
|
||||
other projects.
|
||||
|
||||
If all this sounds interesting to you for some crazy reason, contact me and let me know if I can help you to get into the library, and may be, contribute to it in the future.
|
||||
If all this sounds interesting to you for some crazy reason, contact me and let
|
||||
me know if I can help you to get into the library, and may be if you want, you
|
||||
can contribute to it in the future.
|
||||
This project needs *contributors* more than anything else.
|
||||
|
||||
The current state of the library is decent. In terms of features should be in a similar position than the most used 2D game engines out there.
|
||||
But lacks of course of the support+community that you can get from *Godot* or *cocos2d-x* to mention a couple.
|
||||
The main idea of this library is to focus on a better general approach to develop heavily UI based apps/games than the other options, with cleaner code and implementation.
|
||||
The current state of the library is decent. In terms of features should be in a
|
||||
similar position than the most used 2D game engines out there.
|
||||
But lacks of course of the support+community that you can get from *Godot* or
|
||||
*cocos2d-x* to mention a couple.
|
||||
The main idea of this library is to focus on a better general approach to
|
||||
develop heavily UI based apps/games than the other options, with cleaner code
|
||||
and implementation.
|
||||
|
||||
The main reason I developed the library is for _fun_ and to _learn_ new
|
||||
technologies. I love spending time working on the library, but I know there's
|
||||
probably no real reason to develop something like this with the immense number
|
||||
of similar alternatives.
|
||||
|
||||
|
||||
_**Plans/ideas for the future:**_
|
||||
|
||||
Keep improving the UI system, adding new widgets and improving the CSS support, also simplify and improve the widgets skinning/theming.
|
||||
Keep improving the UI system, adding new widgets and improving the CSS support.
|
||||
Simplify and improve the UI widgets skinning/theming support.
|
||||
Add [CSS animations](https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_Animations/Using_CSS_animations) support.
|
||||
Improve/create documentation for the UI module.
|
||||
Add more examples and also some tools.
|
||||
Add Scripting support ( first i would like to stabilize the library, but i'm getting there ).
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE QtCreatorProject>
|
||||
<!-- Written by QtCreator 4.11.0, 2020-01-10T04:37:46. -->
|
||||
<!-- Written by QtCreator 4.11.0, 2020-01-13T04:18:34. -->
|
||||
<qtcreator>
|
||||
<data>
|
||||
<variable>EnvironmentId</variable>
|
||||
@@ -615,6 +615,42 @@
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">debug-eeiv</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">GenericProjectManager.GenericBuildConfiguration</value>
|
||||
</valuemap>
|
||||
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.21">
|
||||
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">../../make/linux</value>
|
||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
|
||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
|
||||
<valuelist type="QVariantList" key="GenericProjectManager.GenericMakeStep.BuildTargets"/>
|
||||
<value type="bool" key="GenericProjectManager.GenericMakeStep.Clean">false</value>
|
||||
<value type="QString" key="GenericProjectManager.GenericMakeStep.MakeArguments">eepp-ui-hello-world</value>
|
||||
<value type="QString" key="GenericProjectManager.GenericMakeStep.MakeCommand">make</value>
|
||||
<value type="bool" key="GenericProjectManager.GenericMakeStep.OverrideMakeflags">false</value>
|
||||
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">GenericProjectManager.GenericMakeStep</value>
|
||||
</valuemap>
|
||||
<value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
|
||||
</valuemap>
|
||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
|
||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
|
||||
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
|
||||
<value type="QString" key="ProjectExplorer.ProcessStep.Arguments">clean</value>
|
||||
<value type="QString" key="ProjectExplorer.ProcessStep.Command">make</value>
|
||||
<value type="QString" key="ProjectExplorer.ProcessStep.WorkingDirectory">%{buildDir}</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.ProcessStep</value>
|
||||
</valuemap>
|
||||
<value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
|
||||
</valuemap>
|
||||
<value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
|
||||
<value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
|
||||
<valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">debug-ui-hello-world</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">GenericProjectManager.GenericBuildConfiguration</value>
|
||||
</valuemap>
|
||||
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.3">
|
||||
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">../../make/linux</value>
|
||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
|
||||
@@ -885,7 +921,7 @@
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">release-es</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">GenericProjectManager.GenericBuildConfiguration</value>
|
||||
</valuemap>
|
||||
<value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">21</value>
|
||||
<value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">22</value>
|
||||
<valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0">
|
||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
|
||||
<value type="int" key="ProjectExplorer.BuildStepList.StepsCount">0</value>
|
||||
@@ -1507,6 +1543,82 @@
|
||||
<value type="QString" key="RunConfiguration.WorkingDirectory">%{buildDir}../../../bin/</value>
|
||||
<value type="QString" key="RunConfiguration.WorkingDirectory.default"></value>
|
||||
</valuemap>
|
||||
<valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.16">
|
||||
<value type="QString" key="Analyzer.Perf.CallgraphMode">dwarf</value>
|
||||
<valuelist type="QVariantList" key="Analyzer.Perf.Events">
|
||||
<value type="QString">cpu-cycles</value>
|
||||
</valuelist>
|
||||
<valuelist type="QVariantList" key="Analyzer.Perf.ExtraArguments"/>
|
||||
<value type="int" key="Analyzer.Perf.Frequency">250</value>
|
||||
<valuelist type="QVariantList" key="Analyzer.Perf.RecordArguments">
|
||||
<value type="QString">-e</value>
|
||||
<value type="QString">cpu-cycles</value>
|
||||
<value type="QString">--call-graph</value>
|
||||
<value type="QString">dwarf,4096</value>
|
||||
<value type="QString">-F</value>
|
||||
<value type="QString">250</value>
|
||||
</valuelist>
|
||||
<value type="QString" key="Analyzer.Perf.SampleMode">-F</value>
|
||||
<value type="bool" key="Analyzer.Perf.Settings.UseGlobalSettings">true</value>
|
||||
<value type="int" key="Analyzer.Perf.StackSize">4096</value>
|
||||
<value type="bool" key="Analyzer.QmlProfiler.AggregateTraces">false</value>
|
||||
<value type="bool" key="Analyzer.QmlProfiler.FlushEnabled">false</value>
|
||||
<value type="uint" key="Analyzer.QmlProfiler.FlushInterval">0</value>
|
||||
<value type="QString" key="Analyzer.QmlProfiler.LastTraceFile"></value>
|
||||
<value type="bool" key="Analyzer.QmlProfiler.Settings.UseGlobalSettings">true</value>
|
||||
<valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/>
|
||||
<value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value>
|
||||
<value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value>
|
||||
<value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value>
|
||||
<value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value>
|
||||
<value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value>
|
||||
<value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value>
|
||||
<value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value>
|
||||
<value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value>
|
||||
<value type="QString" key="Analyzer.Valgrind.KCachegrindExecutable">kcachegrind</value>
|
||||
<value type="int" key="Analyzer.Valgrind.LeakCheckOnFinish">1</value>
|
||||
<value type="int" key="Analyzer.Valgrind.NumCallers">25</value>
|
||||
<valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/>
|
||||
<value type="int" key="Analyzer.Valgrind.SelfModifyingCodeDetection">1</value>
|
||||
<value type="bool" key="Analyzer.Valgrind.Settings.UseGlobalSettings">true</value>
|
||||
<value type="bool" key="Analyzer.Valgrind.ShowReachable">false</value>
|
||||
<value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value>
|
||||
<value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value>
|
||||
<valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds">
|
||||
<value type="int">0</value>
|
||||
<value type="int">1</value>
|
||||
<value type="int">2</value>
|
||||
<value type="int">3</value>
|
||||
<value type="int">4</value>
|
||||
<value type="int">5</value>
|
||||
<value type="int">6</value>
|
||||
<value type="int">7</value>
|
||||
<value type="int">8</value>
|
||||
<value type="int">9</value>
|
||||
<value type="int">10</value>
|
||||
<value type="int">11</value>
|
||||
<value type="int">12</value>
|
||||
<value type="int">13</value>
|
||||
<value type="int">14</value>
|
||||
</valuelist>
|
||||
<value type="int" key="PE.EnvironmentAspect.Base">2</value>
|
||||
<valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
|
||||
<value type="QString" key="ProjectExplorer.CustomExecutableRunConfiguration.Executable">%{buildDir}../../../bin/eeui-hello-world-debug</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">eeui-hello-world-debug</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.CustomExecutableRunConfiguration</value>
|
||||
<value type="QString" key="ProjectExplorer.RunConfiguration.BuildKey"></value>
|
||||
<value type="QString" key="RunConfiguration.Arguments"></value>
|
||||
<value type="bool" key="RunConfiguration.Arguments.multi">false</value>
|
||||
<value type="QString" key="RunConfiguration.OverrideDebuggerStartup"></value>
|
||||
<value type="bool" key="RunConfiguration.UseCppDebugger">true</value>
|
||||
<value type="bool" key="RunConfiguration.UseCppDebuggerAuto">false</value>
|
||||
<value type="bool" key="RunConfiguration.UseMultiProcess">false</value>
|
||||
<value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
|
||||
<value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
|
||||
<value type="bool" key="RunConfiguration.UseTerminal">false</value>
|
||||
<value type="QString" key="RunConfiguration.WorkingDirectory">%{buildDir}../../../bin/</value>
|
||||
<value type="QString" key="RunConfiguration.WorkingDirectory.default"></value>
|
||||
</valuemap>
|
||||
<valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.2">
|
||||
<value type="QString" key="Analyzer.Perf.CallgraphMode">dwarf</value>
|
||||
<valuelist type="QVariantList" key="Analyzer.Perf.Events">
|
||||
@@ -2115,7 +2227,7 @@
|
||||
<value type="QString" key="RunConfiguration.WorkingDirectory">%{buildDir}../../../bin/</value>
|
||||
<value type="QString" key="RunConfiguration.WorkingDirectory.default"></value>
|
||||
</valuemap>
|
||||
<value type="int" key="ProjectExplorer.Target.RunConfigurationCount">16</value>
|
||||
<value type="int" key="ProjectExplorer.Target.RunConfigurationCount">17</value>
|
||||
</valuemap>
|
||||
</data>
|
||||
<data>
|
||||
|
||||
@@ -27,7 +27,7 @@ static drflac_bool32 drflac_func_seek( void* data, int offset, drflac_seek_origi
|
||||
namespace EE { namespace Audio { namespace Private {
|
||||
|
||||
bool SoundFileReaderFlac::check( IOStream& stream ) {
|
||||
drflac* flac = drflac_open( drflac_func_read, drflac_func_seek, &stream );
|
||||
drflac* flac = drflac_open( drflac_func_read, drflac_func_seek, &stream, NULL );
|
||||
|
||||
if ( flac ) {
|
||||
drflac_close( flac );
|
||||
@@ -47,10 +47,10 @@ SoundFileReaderFlac::~SoundFileReaderFlac() {
|
||||
bool SoundFileReaderFlac::open( IOStream& stream, Info& info ) {
|
||||
stream.seek( 0 );
|
||||
|
||||
if ( ( mFlac = drflac_open( drflac_func_read, drflac_func_seek, &stream ) ) ) {
|
||||
if ( ( mFlac = drflac_open( drflac_func_read, drflac_func_seek, &stream, NULL ) ) ) {
|
||||
info.channelCount = mChannelCount = mFlac->channels;
|
||||
info.sampleRate = mFlac->sampleRate;
|
||||
info.sampleCount = mFlac->totalSampleCount;
|
||||
info.sampleCount = mFlac->totalPCMFrameCount * mFlac->channels;
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
1
src/thirdparty/SOIL2
vendored
Submodule
1
src/thirdparty/SOIL2
vendored
Submodule
Submodule src/thirdparty/SOIL2 added at 2488385abc
1
src/thirdparty/efsw
vendored
Submodule
1
src/thirdparty/efsw
vendored
Submodule
Submodule src/thirdparty/efsw added at 33d6ce34a5
Reference in New Issue
Block a user