diff options
author | Yann Herklotz <ymherklotz@gmail.com> | 2017-12-22 21:16:02 +0000 |
---|---|---|
committer | Yann Herklotz <ymherklotz@gmail.com> | 2017-12-22 21:19:21 +0000 |
commit | fb8197839c0bebc20fd68ee3f280da934c49c473 (patch) | |
tree | e4ccb024144cb5b41f9e572984e3278c2b0b51d0 | |
parent | d6b25272499352383214c738faa8ce1870df37f3 (diff) | |
download | YAGE-fb8197839c0bebc20fd68ee3f280da934c49c473.tar.gz YAGE-fb8197839c0bebc20fd68ee3f280da934c49c473.zip |
Removing editor and refactoring code.
-rw-r--r-- | .dir-locals.el | 4 | ||||
-rw-r--r-- | CMakeLists.txt | 4 | ||||
-rw-r--r-- | editor/editor.pro | 34 | ||||
-rw-r--r-- | editor/editor.pro.user | 336 | ||||
-rw-r--r-- | editor/editorwindow.cpp | 26 | ||||
-rw-r--r-- | editor/editorwindow.h | 25 | ||||
-rw-r--r-- | editor/editorwindow.ui | 69 | ||||
-rw-r--r-- | editor/main.cpp | 19 | ||||
-rw-r--r-- | examples/CMakeLists.txt | 2 | ||||
-rw-r--r-- | examples/simplegame/dngn_blood_fountain.png (renamed from tests/resources/dngn_blood_fountain.png) | bin | 955 -> 955 bytes | |||
-rw-r--r-- | examples/simplegame/main.cpp | 13 | ||||
-rw-r--r-- | examples/simplegame/textureshader.frag | 16 | ||||
-rw-r--r-- | examples/simplegame/textureshader.vert | 23 | ||||
-rw-r--r-- | resources/textureshader.frag | 2 | ||||
-rw-r--r-- | tests/CMakeLists.txt | 33 | ||||
-rw-r--r-- | tests/active/test.cpp (renamed from tests/activetest.cpp) | 0 | ||||
-rw-r--r-- | tests/log/test.cpp (renamed from tests/logtest.cpp) | 0 | ||||
-rw-r--r-- | tests/matrix/test.cpp (renamed from tests/matrixtest.cpp) | 0 | ||||
-rw-r--r-- | tests/particlebody/test.cpp (renamed from tests/particlebodytest.cpp) | 0 | ||||
-rw-r--r-- | tests/rendertest.cpp | 13 | ||||
-rw-r--r-- | tests/rendertest.h | 19 | ||||
-rw-r--r-- | tests/resources/simplegame.frag | 0 | ||||
-rw-r--r-- | tests/resources/simplegame.vert | 0 | ||||
-rw-r--r-- | tests/struct/test.cpp (renamed from tests/structtest.cpp) | 0 | ||||
-rw-r--r-- | tests/syncqueue/test.cpp (renamed from tests/syncqueuetest.cpp) | 0 | ||||
-rw-r--r-- | tests/thread/test.cpp (renamed from tests/threadtest.cpp) | 0 | ||||
-rw-r--r-- | tests/vector3/test.cpp (renamed from tests/vector3test.cpp) | 0 | ||||
-rw-r--r-- | tests/vector4/test.cpp (renamed from tests/vector4test.cpp) | 0 | ||||
-rw-r--r-- | tests/window/test.cpp (renamed from tests/windowtest.cpp) | 0 | ||||
-rw-r--r-- | tests/yage/test.cpp (renamed from tests/yagetest.cpp) | 0 | ||||
-rw-r--r-- | yage/CMakeLists.txt | 3 | ||||
-rw-r--r-- | yage/core/camera2d.cpp | 6 | ||||
-rw-r--r-- | yage/core/camera2d.h | 4 |
33 files changed, 75 insertions, 576 deletions
diff --git a/.dir-locals.el b/.dir-locals.el index b98c6f58..53a0bded 100644 --- a/.dir-locals.el +++ b/.dir-locals.el @@ -1,3 +1,3 @@ ((nil . ((projectile-project-compilation-cmd . "mkdir -p build && cd build && cmake -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DYAGE_BUILD_TESTS=ON .. && make -j9") - (projectile-project-test-cmd . "cd build && ctest") - (projectile-project-run-cmd . "./bin/simplegame")))) + (projectile-project-test-cmd . "cd build/tests && ctest") + (projectile-project-run-cmd . "./build/bin/simplegame")))) diff --git a/CMakeLists.txt b/CMakeLists.txt index 82910286..d480b31c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,6 +11,8 @@ set(CMAKE_CXX_STANDARD 14) # find other libraries from source set(EXTERNAL_DIR ${CMAKE_CURRENT_SOURCE_DIR}/external) +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/") + # GLFW3 set(GLFW_BUILD_DOCS OFF CACHE BOOL "" FORCE) set(GLFW_BUILD_TESTS OFF CACHE BOOL "" FORCE) @@ -48,6 +50,8 @@ target_link_libraries(yage ${GLFW_LIBRARIES} glad) +add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/examples) + if(YAGE_BUILD_TESTS) add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/tests) endif(YAGE_BUILD_TESTS) diff --git a/editor/editor.pro b/editor/editor.pro deleted file mode 100644 index 1cec2824..00000000 --- a/editor/editor.pro +++ /dev/null @@ -1,34 +0,0 @@ -#------------------------------------------------- -# -# Project created by QtCreator 2017-09-10T12:11:18 -# -#------------------------------------------------- - -QT += core gui - -greaterThan(QT_MAJOR_VERSION, 4): QT += widgets - -TARGET = editor -TEMPLATE = app - -# The following define makes your compiler emit warnings if you use -# any feature of Qt which as been marked as deprecated (the exact warnings -# depend on your compiler). Please consult the documentation of the -# deprecated API in order to know how to port your code away from it. -DEFINES += QT_DEPRECATED_WARNINGS - -# You can also make your code fail to compile if you use deprecated APIs. -# In order to do so, uncomment the following line. -# You can also select to disable deprecated APIs only up to a certain version of Qt. -#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0 - - -SOURCES += \ - main.cpp \ - editorwindow.cpp - -HEADERS += \ - editorwindow.h - -FORMS += \ - editorwindow.ui diff --git a/editor/editor.pro.user b/editor/editor.pro.user deleted file mode 100644 index 9432df0a..00000000 --- a/editor/editor.pro.user +++ /dev/null @@ -1,336 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE QtCreatorProject> -<!-- Written by QtCreator 4.3.1, 2017-09-10T12:59:59. --> -<qtcreator> - <data> - <variable>EnvironmentId</variable> - <value type="QByteArray">{9dce752e-6199-4873-be9d-96711f00400a}</value> - </data> - <data> - <variable>ProjectExplorer.Project.ActiveTarget</variable> - <value type="int">0</value> - </data> - <data> - <variable>ProjectExplorer.Project.EditorSettings</variable> - <valuemap type="QVariantMap"> - <value type="bool" key="EditorConfiguration.AutoIndent">true</value> - <value type="bool" key="EditorConfiguration.AutoSpacesForTabs">false</value> - <value type="bool" key="EditorConfiguration.CamelCaseNavigation">true</value> - <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.0"> - <value type="QString" key="language">Cpp</value> - <valuemap type="QVariantMap" key="value"> - <value type="QByteArray" key="CurrentPreferences">CppGlobal</value> - </valuemap> - </valuemap> - <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.1"> - <value type="QString" key="language">QmlJS</value> - <valuemap type="QVariantMap" key="value"> - <value type="QByteArray" key="CurrentPreferences">QmlJSGlobal</value> - </valuemap> - </valuemap> - <value type="int" key="EditorConfiguration.CodeStyle.Count">2</value> - <value type="QByteArray" key="EditorConfiguration.Codec">UTF-8</value> - <value type="bool" key="EditorConfiguration.ConstrainTooltips">false</value> - <value type="int" key="EditorConfiguration.IndentSize">4</value> - <value type="bool" key="EditorConfiguration.KeyboardTooltips">false</value> - <value type="int" key="EditorConfiguration.MarginColumn">80</value> - <value type="bool" key="EditorConfiguration.MouseHiding">true</value> - <value type="bool" key="EditorConfiguration.MouseNavigation">true</value> - <value type="int" key="EditorConfiguration.PaddingMode">1</value> - <value type="bool" key="EditorConfiguration.ScrollWheelZooming">true</value> - <value type="bool" key="EditorConfiguration.ShowMargin">false</value> - <value type="int" key="EditorConfiguration.SmartBackspaceBehavior">0</value> - <value type="bool" key="EditorConfiguration.SmartSelectionChanging">true</value> - <value type="bool" key="EditorConfiguration.SpacesForTabs">true</value> - <value type="int" key="EditorConfiguration.TabKeyBehavior">0</value> - <value type="int" key="EditorConfiguration.TabSize">8</value> - <value type="bool" key="EditorConfiguration.UseGlobal">true</value> - <value type="int" key="EditorConfiguration.Utf8BomBehavior">1</value> - <value type="bool" key="EditorConfiguration.addFinalNewLine">true</value> - <value type="bool" key="EditorConfiguration.cleanIndentation">true</value> - <value type="bool" key="EditorConfiguration.cleanWhitespace">true</value> - <value type="bool" key="EditorConfiguration.inEntireDocument">false</value> - </valuemap> - </data> - <data> - <variable>ProjectExplorer.Project.PluginSettings</variable> - <valuemap type="QVariantMap"/> - </data> - <data> - <variable>ProjectExplorer.Project.Target.0</variable> - <valuemap type="QVariantMap"> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{f5cdc152-9721-42b1-adce-0f96841fccff}</value> - <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value> - <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value> - <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value> - <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0"> - <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/yannherklotz/Github/YAGE/build-editor-Desktop-Debug</value> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> - <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value> - <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">true</value> - <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value> - <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value> - <value type="bool" key="QtProjectManager.QMakeBuildStep.SeparateDebugInfo">false</value> - <value type="bool" key="QtProjectManager.QMakeBuildStep.UseQtQuickCompiler">false</value> - </valuemap> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1"> - <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> - <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments"> - <value type="QString">-w</value> - <value type="QString">-r</value> - </valuelist> - <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> - </valuemap> - <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></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.ProjectConfiguration.DefaultDisplayName">Make</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> - <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments"> - <value type="QString">-w</value> - <value type="QString">-r</value> - </valuelist> - <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></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"></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.DefaultDisplayName">Debug</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value> - <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value> - <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value> - </valuemap> - <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1"> - <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/yannherklotz/Github/YAGE/build-editor-Desktop-Release</value> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> - <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value> - <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value> - <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value> - <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value> - <value type="bool" key="QtProjectManager.QMakeBuildStep.SeparateDebugInfo">false</value> - <value type="bool" key="QtProjectManager.QMakeBuildStep.UseQtQuickCompiler">false</value> - </valuemap> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1"> - <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> - <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments"> - <value type="QString">-w</value> - <value type="QString">-r</value> - </valuelist> - <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> - </valuemap> - <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></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.ProjectConfiguration.DefaultDisplayName">Make</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> - <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments"> - <value type="QString">-w</value> - <value type="QString">-r</value> - </valuelist> - <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></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"></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.DefaultDisplayName">Release</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value> - <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value> - <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value> - </valuemap> - <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.2"> - <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/yannherklotz/Github/YAGE/build-editor-Desktop-Profile</value> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> - <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value> - <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">true</value> - <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value> - <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value> - <value type="bool" key="QtProjectManager.QMakeBuildStep.SeparateDebugInfo">true</value> - <value type="bool" key="QtProjectManager.QMakeBuildStep.UseQtQuickCompiler">false</value> - </valuemap> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1"> - <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> - <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments"> - <value type="QString">-w</value> - <value type="QString">-r</value> - </valuelist> - <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> - </valuemap> - <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></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.ProjectConfiguration.DefaultDisplayName">Make</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> - <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments"> - <value type="QString">-w</value> - <value type="QString">-r</value> - </valuelist> - <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></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"></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.DefaultDisplayName">Profile</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value> - <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value> - <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value> - </valuemap> - <value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">3</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> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value> - </valuemap> - <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy locally</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.DefaultDeployConfiguration</value> - </valuemap> - <value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value> - <valuemap type="QVariantMap" key="ProjectExplorer.Target.PluginSettings"/> - <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0"> - <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">1000</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="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.ProjectConfiguration.DefaultDisplayName">editor</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:/home/yannherklotz/Github/YAGE/editor/editor.pro</value> - <value type="bool" key="QmakeProjectManager.QmakeRunConfiguration.UseLibrarySearchPath">true</value> - <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.CommandLineArguments"></value> - <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.ProFile">editor.pro</value> - <value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseDyldImageSuffix">false</value> - <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory"></value> - <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory.default">/home/yannherklotz/Github/YAGE/build-editor-Desktop-Debug</value> - <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value> - <value type="bool" key="RunConfiguration.UseCppDebugger">false</value> - <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</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> - </valuemap> - <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value> - </valuemap> - </data> - <data> - <variable>ProjectExplorer.Project.TargetCount</variable> - <value type="int">1</value> - </data> - <data> - <variable>ProjectExplorer.Project.Updater.FileVersion</variable> - <value type="int">18</value> - </data> - <data> - <variable>Version</variable> - <value type="int">18</value> - </data> -</qtcreator> diff --git a/editor/editorwindow.cpp b/editor/editorwindow.cpp deleted file mode 100644 index aad84612..00000000 --- a/editor/editorwindow.cpp +++ /dev/null @@ -1,26 +0,0 @@ -/* ---------------------------------------------------------------------------- - * /home/yannherklotz/Github/YAGE/editor/editorwindow.cpp - * - * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> - * MIT License, see LICENSE file for more details. - * ---------------------------------------------------------------------------- - */ - -#include "editorwindow.h" -#include "ui_editorwindow.h" - -EditorWindow::EditorWindow(QWidget *parent) : - QMainWindow(parent), - ui(new Ui::EditorWindow) -{ - ui->setupUi(this); -} - -EditorWindow::~EditorWindow() -{ - delete ui; -} - -void EditorWindow::on_openGLWidget_destroyed() -{ -} diff --git a/editor/editorwindow.h b/editor/editorwindow.h deleted file mode 100644 index 1e3e8045..00000000 --- a/editor/editorwindow.h +++ /dev/null @@ -1,25 +0,0 @@ -#ifndef EDITORWINDOW_H -#define EDITORWINDOW_H - -#include <QMainWindow> - -namespace Ui { -class EditorWindow; -} - -class EditorWindow : public QMainWindow -{ - Q_OBJECT - -public: - explicit EditorWindow(QWidget *parent = 0); - ~EditorWindow(); - -private slots: - void on_openGLWidget_destroyed(); - -private: - Ui::EditorWindow *ui; -}; - -#endif // EDITORWINDOW_H diff --git a/editor/editorwindow.ui b/editor/editorwindow.ui deleted file mode 100644 index 63fd4940..00000000 --- a/editor/editorwindow.ui +++ /dev/null @@ -1,69 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<ui version="4.0"> - <class>EditorWindow</class> - <widget class="QMainWindow" name="EditorWindow"> - <property name="geometry"> - <rect> - <x>0</x> - <y>0</y> - <width>1920</width> - <height>1080</height> - </rect> - </property> - <property name="windowTitle"> - <string>EditorWindow</string> - </property> - <widget class="QWidget" name="centralWidget"> - <widget class="QOpenGLWidget" name="openGLWidget"> - <property name="geometry"> - <rect> - <x>110</x> - <y>80</y> - <width>1071</width> - <height>431</height> - </rect> - </property> - </widget> - </widget> - <widget class="QMenuBar" name="menuBar"> - <property name="geometry"> - <rect> - <x>0</x> - <y>0</y> - <width>1920</width> - <height>22</height> - </rect> - </property> - <widget class="QMenu" name="menuYage_Editor"> - <property name="title"> - <string>File</string> - </property> - <addaction name="actionNew_Game"/> - </widget> - <widget class="QMenu" name="menuEdit"> - <property name="title"> - <string>Edit</string> - </property> - </widget> - <addaction name="menuYage_Editor"/> - <addaction name="menuEdit"/> - </widget> - <widget class="QToolBar" name="mainToolBar"> - <attribute name="toolBarArea"> - <enum>TopToolBarArea</enum> - </attribute> - <attribute name="toolBarBreak"> - <bool>false</bool> - </attribute> - </widget> - <widget class="QStatusBar" name="statusBar"/> - <action name="actionNew_Game"> - <property name="text"> - <string>New Game</string> - </property> - </action> - </widget> - <layoutdefault spacing="6" margin="11"/> - <resources/> - <connections/> -</ui> diff --git a/editor/main.cpp b/editor/main.cpp deleted file mode 100644 index bc80117b..00000000 --- a/editor/main.cpp +++ /dev/null @@ -1,19 +0,0 @@ -/* ---------------------------------------------------------------------------- - * /home/yannherklotz/Github/YAGE/editor/main.cpp - * - * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> - * MIT License, see LICENSE file for more details. - * ---------------------------------------------------------------------------- - */ - -#include "editorwindow.h" -#include <QApplication> - -int main(int argc, char *argv[]) -{ - QApplication a(argc, argv); - EditorWindow w; - w.show(); - - return a.exec(); -} diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt new file mode 100644 index 00000000..16b20795 --- /dev/null +++ b/examples/CMakeLists.txt @@ -0,0 +1,2 @@ +add_executable(simplegame simplegame/main.cpp) +target_link_libraries(simplegame yage) diff --git a/tests/resources/dngn_blood_fountain.png b/examples/simplegame/dngn_blood_fountain.png Binary files differindex 7214fd47..7214fd47 100644 --- a/tests/resources/dngn_blood_fountain.png +++ b/examples/simplegame/dngn_blood_fountain.png diff --git a/examples/simplegame/main.cpp b/examples/simplegame/main.cpp index 04d63ec0..a631e45b 100644 --- a/examples/simplegame/main.cpp +++ b/examples/simplegame/main.cpp @@ -22,16 +22,16 @@ int main() window.create("Simple Game", 800, 640); SpriteBatch sp; - program.compileShadersFromFile("resources/textureshader.vert", "resources/textureshader.frag"); + program.compileShadersFromFile("examples/simplegame/textureshader.vert", + "examples/simplegame/textureshader.frag"); program.linkShaders(); - Texture fountain = - ResourceManager::getTexture("/home/yannherklotz/Github/YAGE/tests/" - "resources/dngn_blood_fountain.png"); + Texture fountain = ResourceManager::getTexture( + "examples/simplegame/dngn_blood_fountain.png"); cout << "texture: " << fountain.width << ", " << fountain.height << '\n'; - Camera2D camera(800, 640); + Camera camera(800, 640); while (!window.shouldClose()) { window.clearBuffer(); @@ -44,7 +44,8 @@ int main() GLint texture_location = program.getUniformLocation("texture_sampler"); glUniform1i(texture_location, 0); - sp.draw({0.f, 0.f, 64.f, 64.f}, {0, 0, 1, 1}, fountain.id, Colour(255, 0, 255, 255), 0); + sp.draw({0.f, 0.f, 64.f, 64.f}, {0, 0, 1, 1}, fountain.id, + Colour(255, 0, 255, 255), 0); sp.render(); glBindTexture(GL_TEXTURE_2D, 0); diff --git a/examples/simplegame/textureshader.frag b/examples/simplegame/textureshader.frag new file mode 100644 index 00000000..ef728b04 --- /dev/null +++ b/examples/simplegame/textureshader.frag @@ -0,0 +1,16 @@ +#version 450 + +layout(location = 0) in vec2 fragment_position; +layout(location = 1) in vec4 fragment_colour; +layout(location = 2) in vec2 fragment_uv; + +out vec4 colour; + +uniform sampler2D texture_sampler; + +void main() +{ + vec4 texture_color = texture(texture_sampler, fragment_uv); + + colour = texture_color * fragment_colour; +} diff --git a/examples/simplegame/textureshader.vert b/examples/simplegame/textureshader.vert new file mode 100644 index 00000000..3277d8b0 --- /dev/null +++ b/examples/simplegame/textureshader.vert @@ -0,0 +1,23 @@ +#version 450 + +layout(location = 0) in vec2 vertex_position; +layout(location = 1) in vec4 vertex_colour; +layout(location = 2) in vec2 vertex_uv; + +layout(location = 0) out vec2 fragment_position; +layout(location = 1) out vec4 fragment_colour; +layout(location = 2) out vec2 fragment_uv; + +uniform mat4 P; + +void main() +{ + gl_Position.xy = (P*vec4(vertex_position, 0.0, 1.0)).xy; + gl_Position.z = 0.0; + gl_Position.w = 1.0; + + fragment_position = vertex_position; + fragment_colour = vertex_colour; + fragment_uv = vec2(vertex_uv.x, 1-vertex_uv.y); + +} diff --git a/resources/textureshader.frag b/resources/textureshader.frag index 37a8a219..ef728b04 100644 --- a/resources/textureshader.frag +++ b/resources/textureshader.frag @@ -12,5 +12,5 @@ void main() { vec4 texture_color = texture(texture_sampler, fragment_uv); - colour = texture_color; + colour = texture_color * fragment_colour; } diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 613e0bdb..36afa574 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -8,30 +8,27 @@ set(BUILD_GMOCK OFF CACHE BOOL "" FORCE) # the gtest and gtest_main targets. add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/external/googletest) -add_executable(simplegame simplegame.cpp) -target_link_libraries(simplegame yage) - # enable tests enable_testing() set(SIMULATION_RUNS 1000) function(make_test test_name cycles) - add_executable(${test_name} ${test_name}.cpp) - target_link_libraries(${test_name} + add_executable("${test_name}test" ${test_name}/test.cpp) + target_link_libraries("${test_name}test" gtest_main yage) - add_test(NAME ${test_name} COMMAND ${test_name} --gtest_repeat=${cycles} --gtest_break_on_failure) + add_test(NAME ${test_name} COMMAND "${test_name}test" --gtest_repeat=${cycles} --gtest_break_on_failure) endfunction(make_test) -make_test(yagetest 1) -make_test(matrixtest ${SIMULATION_RUNS}) -make_test(particlebodytest 100) -make_test(windowtest ${SIMULATION_RUNS}) -make_test(spritesheettest ${SIMULATION_RUNS}) -make_test(vector3test ${SIMULATION_RUNS}) -make_test(vector4test ${SIMULATION_RUNS}) -make_test(logtest 1) -make_test(threadtest 1) -make_test(syncqueuetest 1) -make_test(activetest 1) -make_test(structtest ${SIMULATION_RUNS}) +make_test(yage 1) +make_test(matrix ${SIMULATION_RUNS}) +make_test(particlebody 100) +make_test(window ${SIMULATION_RUNS}) +make_test(spritesheet ${SIMULATION_RUNS}) +make_test(vector3 ${SIMULATION_RUNS}) +make_test(vector4 ${SIMULATION_RUNS}) +make_test(log 1) +make_test(thread 1) +make_test(syncqueue 1) +make_test(active 1) +make_test(struct ${SIMULATION_RUNS}) diff --git a/tests/activetest.cpp b/tests/active/test.cpp index 3d561283..3d561283 100644 --- a/tests/activetest.cpp +++ b/tests/active/test.cpp diff --git a/tests/logtest.cpp b/tests/log/test.cpp index e1010754..e1010754 100644 --- a/tests/logtest.cpp +++ b/tests/log/test.cpp diff --git a/tests/matrixtest.cpp b/tests/matrix/test.cpp index 1e316502..1e316502 100644 --- a/tests/matrixtest.cpp +++ b/tests/matrix/test.cpp diff --git a/tests/particlebodytest.cpp b/tests/particlebody/test.cpp index 09277826..09277826 100644 --- a/tests/particlebodytest.cpp +++ b/tests/particlebody/test.cpp diff --git a/tests/rendertest.cpp b/tests/rendertest.cpp deleted file mode 100644 index 74476ef8..00000000 --- a/tests/rendertest.cpp +++ /dev/null @@ -1,13 +0,0 @@ -/** --------------------------------------------------------------------------- - * @file: rendertest.cpp - * - * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> - * MIT License, see LICENSE file for more details. - * ---------------------------------------------------------------------------- - */ - -#include "rendertest.h" - -RenderTest::RenderTest(std::string sprite) : sprite_(sprite) {} - -void RenderTest::render() {} diff --git a/tests/rendertest.h b/tests/rendertest.h deleted file mode 100644 index db0e06e2..00000000 --- a/tests/rendertest.h +++ /dev/null @@ -1,19 +0,0 @@ -/** --------------------------------------------------------------------------- - * @file: rendertest.h - * - * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> - * MIT License, see LICENSE file for more details. - * ---------------------------------------------------------------------------- - */ - -#include <string> - -class RenderTest -{ -public: - RenderTest(std::string sprite); - void render(); - -private: - std::string sprite_; -}; diff --git a/tests/resources/simplegame.frag b/tests/resources/simplegame.frag deleted file mode 100644 index e69de29b..00000000 --- a/tests/resources/simplegame.frag +++ /dev/null diff --git a/tests/resources/simplegame.vert b/tests/resources/simplegame.vert deleted file mode 100644 index e69de29b..00000000 --- a/tests/resources/simplegame.vert +++ /dev/null diff --git a/tests/structtest.cpp b/tests/struct/test.cpp index 99752abb..99752abb 100644 --- a/tests/structtest.cpp +++ b/tests/struct/test.cpp diff --git a/tests/syncqueuetest.cpp b/tests/syncqueue/test.cpp index 1d7d8037..1d7d8037 100644 --- a/tests/syncqueuetest.cpp +++ b/tests/syncqueue/test.cpp diff --git a/tests/threadtest.cpp b/tests/thread/test.cpp index 0527665a..0527665a 100644 --- a/tests/threadtest.cpp +++ b/tests/thread/test.cpp diff --git a/tests/vector3test.cpp b/tests/vector3/test.cpp index 570a5c10..570a5c10 100644 --- a/tests/vector3test.cpp +++ b/tests/vector3/test.cpp diff --git a/tests/vector4test.cpp b/tests/vector4/test.cpp index 53554a25..53554a25 100644 --- a/tests/vector4test.cpp +++ b/tests/vector4/test.cpp diff --git a/tests/windowtest.cpp b/tests/window/test.cpp index 40b7e664..40b7e664 100644 --- a/tests/windowtest.cpp +++ b/tests/window/test.cpp diff --git a/tests/yagetest.cpp b/tests/yage/test.cpp index a599eba2..a599eba2 100644 --- a/tests/yagetest.cpp +++ b/tests/yage/test.cpp diff --git a/yage/CMakeLists.txt b/yage/CMakeLists.txt deleted file mode 100644 index b28b04f6..00000000 --- a/yage/CMakeLists.txt +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/yage/core/camera2d.cpp b/yage/core/camera2d.cpp index 89d41ab5..463dd0d2 100644 --- a/yage/core/camera2d.cpp +++ b/yage/core/camera2d.cpp @@ -14,14 +14,14 @@ namespace yage { -Camera2D::Camera2D(int screen_width, int screen_height) +Camera::Camera(int screen_width, int screen_height) : position_(0.f, 0.f), camera_matrix_(1.f), ortho_matrix_( glm::ortho(0.f, (float)screen_width, 0.f, (float)screen_height)) { } -void Camera2D::update(GlslProgram &program) +void Camera::update(GlslProgram &program) { if (update_matrix_) { glm::vec3 translate(-position_.x, -position_.y, 0.f); @@ -37,7 +37,7 @@ void Camera2D::update(GlslProgram &program) glUniformMatrix4fv(matrix_location, 1, GL_FALSE, &(camera_matrix_[0][0])); } -void Camera2D::move(const glm::vec2 &direction) +void Camera::move(const glm::vec2 &direction) { position_ += direction; update_matrix_ = true; diff --git a/yage/core/camera2d.h b/yage/core/camera2d.h index db941aee..109333d6 100644 --- a/yage/core/camera2d.h +++ b/yage/core/camera2d.h @@ -17,7 +17,7 @@ namespace yage class GlslProgram; -class Camera2D +class Camera { private: bool update_matrix_ = true; @@ -27,7 +27,7 @@ private: glm::mat4 ortho_matrix_; public: - Camera2D(int screen_width = 1280, int screen_height = 720); + Camera(int screen_width = 1280, int screen_height = 720); void update(GlslProgram &program); void move(const glm::vec2 &direction); |