-
Notifications
You must be signed in to change notification settings - Fork 30
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* gwork: (54 commits) Use for-range Store and restore OpenGL states whilst rendering - Thanks to @lonestarr - garrynewman/GWEN#59 Tidy. Specific directory for SFML2 resource loading - Use directory relative to application executable. - Fixes issue #29 - Fix app resource copy for non-bundled apps. Add editor config. Use cmake file properties to set bundle resources for OSX. Replace deprecated method - SFML2.4 setColor deprecated Tidy. If tall menu descends off screen then clamp to screen height - Thanks to @qehgt - garrynewman/GWEN@c8aacf8 Include correct dialog header. - Thanks to @kklouzal - garrynewman/GWEN#95 Correct spelling of caret. - Thanks to @kklouzal garrynewman/GWEN#93 comment cannot be on same line. Disable use of CTT for color picker. - Address issue #27. - Temporarily disable cache to texture. Broken with Allegro 5.2. cmake: Make MacOS package - This fixes hi-res screen for Allegro5. See Allegro5 notes on building apps for OSX. Use C++11 def to build C++11. Add <cctype> header for std::isprint Changes to get GWork to compile on Windows/VS2015 Use DebugBreak to break into debugger - cross platform debug break to fix issue #25 - Correct readme - simplify gitignore - Output bin/lib to root. - cmake -D doesn't like spaces - Readme: use Allegro 5 instead of SDL2 as clipping bug not fixed Clarify origin of std::isprint ... # Conflicts: # cmake/Modules/FindAllegro5.cmake # cmgen.sh # source/gwork/include/Gwork/Skins/Simple.h # source/gwork/include/Gwork/Skins/TexturedBase.h # source/gwork/source/Events.cpp # source/platform/renderers/Allegro5/Allegro5.cpp # source/platform/renderers/Direct2D/Direct2D.cpp # source/platform/renderers/DirectX9/DirectX9.cpp # source/platform/renderers/GDIPlus/GDIPlus.cpp # source/platform/renderers/OpenGL/OpenGL.cpp # source/samples/Allegro5/Allegro5Sample.cpp # source/test/source/api/Button.cpp
- Loading branch information
Showing
95 changed files
with
11,860 additions
and
2,609 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| # Configuration file for EditorConfig | ||
| # More information is available under http://EditorConfig.org | ||
|
|
||
| # Ignore any other files further up in the file system | ||
| root = true | ||
|
|
||
| # Configuration for all files | ||
| [*] | ||
| # Always end files with a blank line | ||
| insert_final_newline = true | ||
| # Force space characters for indentation | ||
| indent_style = space | ||
| # Always indent by 4 characters | ||
| indent_size = 4 | ||
| # Remove whitespace characters at the end of line | ||
| trim_trailing_whitespace = true | ||
| # Enforce Unix style line endings (\n only) | ||
| #end_of_line = lf |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,197 +1,7 @@ | ||
|
|
||
| *.doxcfg | ||
|
|
||
| ################# | ||
| ## Cmake | ||
| ################# | ||
|
|
||
| CMakeCache.txt | ||
| CMakeFiles | ||
| CMakeScripts | ||
| Makefile | ||
| cmake_install.cmake | ||
| install_manifest.txt | ||
|
|
||
| .ninja_deps | ||
| .ninja_log | ||
| *.ninja | ||
|
|
||
| ################# | ||
| ## Eclipse | ||
| ################# | ||
|
|
||
| *.pydevproject | ||
| .project | ||
| .metadata | ||
| #bin/** | ||
| tmp/** | ||
| tmp/**/* | ||
| *.tmp | ||
| *.bak | ||
| *.swp | ||
| *~.nib | ||
| local.properties | ||
| .classpath | ||
| .settings/ | ||
| .loadpath | ||
|
|
||
| # External tool builders | ||
| .externalToolBuilders/ | ||
|
|
||
| # Locally stored "Eclipse launch configurations" | ||
| *.launch | ||
|
|
||
| # CDT-specific | ||
| .cproject | ||
|
|
||
| # PDT-specific | ||
| .buildpath | ||
|
|
||
|
|
||
| ################# | ||
| ## Visual Studio | ||
| ################# | ||
|
|
||
| ## Ignore Visual Studio temporary files, build results, and | ||
| ## files generated by popular Visual Studio add-ons. | ||
|
|
||
| # User-specific files | ||
| *.suo | ||
| *.user | ||
| *.sln.docstates | ||
|
|
||
| # Build results | ||
| **/[Dd]ebug/ | ||
| **/[Rr]elease/ | ||
| *_i.c | ||
| *_p.c | ||
| *.ilk | ||
| *.meta | ||
| *.obj | ||
| *.pch | ||
| *.pdb | ||
| *.pgc | ||
| *.pgd | ||
| *.rsp | ||
| *.sbr | ||
| *.tlb | ||
| *.tli | ||
| *.tlh | ||
| *.tmp | ||
| *.vspscc | ||
| .builds | ||
| **/*.dotCover | ||
|
|
||
| ## TODO: If you have NuGet Package Restore enabled, uncomment this | ||
| #**/packages/ | ||
|
|
||
| # Visual C++ cache files | ||
| ipch/ | ||
| *.aps | ||
| *.ncb | ||
| *.opensdf | ||
| *.sdf | ||
|
|
||
| # Visual Studio profiler | ||
| *.psess | ||
| *.vsp | ||
|
|
||
| # ReSharper is a .NET coding add-in | ||
| _ReSharper* | ||
|
|
||
| # Installshield output folder | ||
| [Ee]xpress | ||
|
|
||
| # DocProject is a documentation generator add-in | ||
| DocProject/buildhelp/ | ||
| DocProject/Help/*.HxT | ||
| DocProject/Help/*.HxC | ||
| DocProject/Help/*.hhc | ||
| DocProject/Help/*.hhk | ||
| DocProject/Help/*.hhp | ||
| DocProject/Help/Html2 | ||
| DocProject/Help/html | ||
|
|
||
| # Click-Once directory | ||
| publish | ||
|
|
||
| # Others | ||
| #[Bb]in | ||
| [Oo]bj | ||
| sql | ||
| TestResults | ||
| *.Cache | ||
| ClientBin | ||
| stylecop.* | ||
| ~$* | ||
| *.dbmdl | ||
| Generated_Code #added for RIA/Silverlight projects | ||
|
|
||
| # Backup & report files from converting an old project file to a newer | ||
| # Visual Studio version. Backup files are not needed, because we have git ;-) | ||
| _UpgradeReport_Files/ | ||
| Backup*/ | ||
| UpgradeLog*.XML | ||
|
|
||
|
|
||
| ############ | ||
| ## Windows | ||
| ############ | ||
|
|
||
| # Windows image file caches | ||
| Thumbs.db | ||
|
|
||
| # Folder config file | ||
| Desktop.ini | ||
|
|
||
|
|
||
| ############# | ||
| ## Python | ||
| ############# | ||
|
|
||
| *.py[co] | ||
|
|
||
| # Packages | ||
| *.egg | ||
| *.egg-info | ||
| dist | ||
| build | ||
| eggs | ||
| parts | ||
| #bin | ||
| var | ||
| sdist | ||
| develop-eggs | ||
| .installed.cfg | ||
|
|
||
| # Installer logs | ||
| pip-log.txt | ||
|
|
||
| # Unit test / coverage reports | ||
| .coverage | ||
| .tox | ||
|
|
||
| #Translations | ||
| *.mo | ||
|
|
||
| #Mr Developer | ||
| .mr.developer.cfg | ||
|
|
||
| # Mac crap | ||
| .DS_Store | ||
| *.dylib | ||
| *.a | ||
|
|
||
| ############ | ||
| ## Xcode | ||
| ############ | ||
|
|
||
| *.pbxproj | ||
| xcschemes | ||
| *.xcuserstate | ||
| *.xcsettings | ||
| *.xcworkspacedata | ||
| *.xcuserdatad | ||
| *Instruments.trace* | ||
|
|
||
| bin/ | ||
| lib/ | ||
|
|
||
| build*/ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,50 @@ | ||
| MIT License | ||
|
|
||
| Copyright (C) 2012 Garry Newman | ||
| Copyright (C) 2015-2016 Billy Quith | ||
| GWEN/Gwork - MIT License | ||
| ------------------------ | ||
|
|
||
| Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: | ||
| - Copyright (C) 2012 Garry Newman | ||
| - Copyright (C) 2015-2016 Bill Quith | ||
|
|
||
| The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. | ||
| Permission is hereby granted, free of charge, to any person obtaining a copy of this software and | ||
| associated documentation files (the "Software"), to deal in the Software without restriction, | ||
| including without limitation the rights to use, copy, modify, merge, publish, distribute, | ||
| sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is | ||
| furnished to do so, subject to the following conditions: | ||
|
|
||
| THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
| The above copyright notice and this permission notice shall be included in all copies or | ||
| substantial portions of the Software. | ||
|
|
||
| THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT | ||
| NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND | ||
| NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, | ||
| DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT | ||
| OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
|
|
||
|
|
||
| Debug Break | ||
| ----------- | ||
|
|
||
| Copyright (c) 2011-2015, Scott Tsai | ||
|
|
||
| All rights reserved. | ||
|
|
||
| Redistribution and use in source and binary forms, with or without | ||
| modification, are permitted provided that the following conditions are met: | ||
|
|
||
| 1. Redistributions of source code must retain the above copyright notice, | ||
| this list of conditions and the following disclaimer. | ||
| 2. Redistributions in binary form must reproduce the above copyright notice, | ||
| this list of conditions and the following disclaimer in the documentation | ||
| and/or other materials provided with the distribution. | ||
|
|
||
| THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | ||
| AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
| IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
| ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE | ||
| LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | ||
| CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | ||
| SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | ||
| INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | ||
| CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | ||
| ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | ||
| POSSIBILITY OF SUCH DAMAGE. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.