From 9f2a0d43f40fb429dbd5cd479a6a441b9f81945e Mon Sep 17 00:00:00 2001 From: Katharina Ott Date: Wed, 12 Jun 2019 18:19:10 +0200 Subject: [PATCH] changed .hpp to .h + addons for other stuff + make it work on windows --- .gitignore | 3 ++- .vs/ProjectSettings.json | 3 +++ .vs/VSWorkspaceState.json | 7 +++++++ .vs/slnx.sqlite | Bin 0 -> 77824 bytes Projekt_FORUM.vcxproj.user | 19 +++++++++++++++++++ src/avatar.cpp | 2 +- src/{avatar.hpp => avatar.h} | 2 +- src/greatWhole.cpp | 4 ++-- src/{greatWhole.hpp => greatWhole.h} | 4 ++-- src/main.cpp | 8 +++++--- src/objectPhysics.cpp | 2 +- src/{objectPhysics.hpp => objectPhysics.h} | 8 ++++---- src/ofApp.h | 16 ++++++++-------- src/particle.cpp | 2 +- src/{particle.hpp => particle.h} | 2 +- src/particleSystem.cpp | 2 +- src/{particleSystem.hpp => particleSystem.h} | 4 ++-- src/visitor.cpp | 2 +- src/{visitor.hpp => visitor.h} | 2 +- 19 files changed, 62 insertions(+), 30 deletions(-) create mode 100644 .vs/ProjectSettings.json create mode 100644 .vs/VSWorkspaceState.json create mode 100644 .vs/slnx.sqlite create mode 100644 Projekt_FORUM.vcxproj.user rename src/{avatar.hpp => avatar.h} (98%) rename src/{greatWhole.hpp => greatWhole.h} (95%) rename src/{objectPhysics.hpp => objectPhysics.h} (92%) rename src/{particle.hpp => particle.h} (97%) rename src/{particleSystem.hpp => particleSystem.h} (95%) rename src/{visitor.hpp => visitor.h} (97%) diff --git a/.gitignore b/.gitignore index 3b2a2e2..685cf4d 100755 --- a/.gitignore +++ b/.gitignore @@ -90,4 +90,5 @@ Thumbs.db Desktop.ini # Android -.csettings \ No newline at end of file +.csettings +/.vs/Projekt_FORUM/v15 diff --git a/.vs/ProjectSettings.json b/.vs/ProjectSettings.json new file mode 100644 index 0000000..0cf5ea5 --- /dev/null +++ b/.vs/ProjectSettings.json @@ -0,0 +1,3 @@ +{ + "CurrentProjectSetting": "No Configurations" +} \ No newline at end of file diff --git a/.vs/VSWorkspaceState.json b/.vs/VSWorkspaceState.json new file mode 100644 index 0000000..bb42b5b --- /dev/null +++ b/.vs/VSWorkspaceState.json @@ -0,0 +1,7 @@ +{ + "ExpandedNodes": [ + "", + "\\src" + ], + "PreviewInSolutionExplorer": false +} \ No newline at end of file diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite new file mode 100644 index 0000000000000000000000000000000000000000..ab066806dc87b53b2302a4a064c041279e57fe79 GIT binary patch literal 77824 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 literal 0 HcmV?d00001 diff --git a/Projekt_FORUM.vcxproj.user b/Projekt_FORUM.vcxproj.user new file mode 100644 index 0000000..09a332b --- /dev/null +++ b/Projekt_FORUM.vcxproj.user @@ -0,0 +1,19 @@ + + + + $(ProjectDir)/bin + WindowsLocalDebugger + + + $(ProjectDir)/bin + WindowsLocalDebugger + + + $(ProjectDir)/bin + WindowsLocalDebugger + + + $(ProjectDir)/bin + WindowsLocalDebugger + + \ No newline at end of file diff --git a/src/avatar.cpp b/src/avatar.cpp index 402824d..724a875 100644 --- a/src/avatar.cpp +++ b/src/avatar.cpp @@ -5,7 +5,7 @@ // Created by Sebastian Holzki on 17.04.19. // -#include "avatar.hpp" +#include "avatar.h" diff --git a/src/avatar.hpp b/src/avatar.h similarity index 98% rename from src/avatar.hpp rename to src/avatar.h index ad125b0..b627077 100644 --- a/src/avatar.hpp +++ b/src/avatar.h @@ -1,5 +1,5 @@ // -// avatar.hpp +// avatar.h // emptyExample // // Created by Sebastian Holzki on 17.04.19. diff --git a/src/greatWhole.cpp b/src/greatWhole.cpp index e426215..01f45fc 100644 --- a/src/greatWhole.cpp +++ b/src/greatWhole.cpp @@ -5,8 +5,8 @@ // Created by Sebastian Holzki on 17.04.19. // -#include "greatWhole.hpp" -#include "avatar.hpp" +#include "greatWhole.h" +#include "avatar.h" diff --git a/src/greatWhole.hpp b/src/greatWhole.h similarity index 95% rename from src/greatWhole.hpp rename to src/greatWhole.h index fdcb95a..67556c2 100644 --- a/src/greatWhole.hpp +++ b/src/greatWhole.h @@ -1,5 +1,5 @@ // -// greatWhole.hpp +// greatWhole.h // emptyExample // // Created by Sebastian Holzki on 17.04.19. @@ -7,7 +7,7 @@ #include #include "ofMain.h" -#include "avatar.hpp" +#include "avatar.h" #pragma once diff --git a/src/main.cpp b/src/main.cpp index f73817a..9e844df 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -6,10 +6,12 @@ int main( ){ ofSetupOpenGL(1000,1000, OF_WINDOW); // <-------- setup the GL context + ofGLFWWindowSettings settings; + settings.setGLVersion(3, 2); + settings.setSize(1280, 800); + ofCreateWindow(settings); - // this kicks off the running of my app - // can be OF_WINDOW or OF_FULLSCREEN - // pass in width and height too: + ofRunApp(new ofApp()); ofRunApp( new ofApp()); } diff --git a/src/objectPhysics.cpp b/src/objectPhysics.cpp index 089b6d3..6e3e52c 100644 --- a/src/objectPhysics.cpp +++ b/src/objectPhysics.cpp @@ -5,7 +5,7 @@ // Created by Sebastian Holzki on 11.06.19. // -#include "objectPhysics.hpp" +#include "objectPhysics.h" diff --git a/src/objectPhysics.hpp b/src/objectPhysics.h similarity index 92% rename from src/objectPhysics.hpp rename to src/objectPhysics.h index 1e3cfe2..130c343 100644 --- a/src/objectPhysics.hpp +++ b/src/objectPhysics.h @@ -1,16 +1,16 @@ // -// objectPhysics.hpp +// objectPhysics.h // emptyExample // // Created by Sebastian Holzki on 01.05.19. // -#ifndef objectPhysics_hpp -#define objectPhysics_hpp +#ifndef objectPhysics_h +#define objectPhysics_h #include #include "ofMain.h" -#endif /* objectPhysics_hpp */ +#endif /* objectPhysics_h */ class ObjectPhysics { diff --git a/src/ofApp.h b/src/ofApp.h index 1259f1c..aa62592 100644 --- a/src/ofApp.h +++ b/src/ofApp.h @@ -1,17 +1,17 @@ #pragma once #include "ofMain.h" -#include "particleSystem.hpp" -#include "greatWhole.hpp" -#include "avatar.hpp" +#include "particleSystem.h" +#include "greatWhole.h" +#include "avatar.h" #include "ofxOsc.h" -#include "visitor.hpp" -#include "objectPhysics.hpp" -#include "particle.hpp" +#include "visitor.h" +#include "objectPhysics.h" +#include "particle.h" - int WINDOWSIZE_WIDTH = 1000; - int WINDOWSIZE_HEIGHT = 1000; + //int WINDOWSIZE_WIDTH = 1000; + //int WINDOWSIZE_HEIGHT = 1000; diff --git a/src/particle.cpp b/src/particle.cpp index 1c51d0c..dbf2bd9 100644 --- a/src/particle.cpp +++ b/src/particle.cpp @@ -5,7 +5,7 @@ // Created by Sebastian Holzki on 16.04.19. // -#include "particle.hpp" +#include "particle.h" diff --git a/src/particle.hpp b/src/particle.h similarity index 97% rename from src/particle.hpp rename to src/particle.h index 9f9ecf2..b366654 100644 --- a/src/particle.hpp +++ b/src/particle.h @@ -1,5 +1,5 @@ // -// particle.hpp +// particle.h // // Created by Sebastian Holzki on 16.04.19. // diff --git a/src/particleSystem.cpp b/src/particleSystem.cpp index 33110dc..617be0e 100644 --- a/src/particleSystem.cpp +++ b/src/particleSystem.cpp @@ -5,7 +5,7 @@ // Created by Sebastian Holzki on 16.04.19. // -#include "particleSystem.hpp" +#include "particleSystem.h" diff --git a/src/particleSystem.hpp b/src/particleSystem.h similarity index 95% rename from src/particleSystem.hpp rename to src/particleSystem.h index 326fb5b..6eeb5e5 100644 --- a/src/particleSystem.hpp +++ b/src/particleSystem.h @@ -1,5 +1,5 @@ // -// particleSystem.hpp +// particleSystem.h // emptyExample // // Created by Sebastian Holzki on 16.04.19. @@ -10,7 +10,7 @@ #include -#include "particle.hpp" +#include "particle.h" diff --git a/src/visitor.cpp b/src/visitor.cpp index ef72087..93b7981 100644 --- a/src/visitor.cpp +++ b/src/visitor.cpp @@ -5,7 +5,7 @@ // Created by Sebastian Holzki on 11.06.19. // -#include "visitor.hpp" +#include "visitor.h" diff --git a/src/visitor.hpp b/src/visitor.h similarity index 97% rename from src/visitor.hpp rename to src/visitor.h index af8c3fe..5974da6 100644 --- a/src/visitor.hpp +++ b/src/visitor.h @@ -1,5 +1,5 @@ // -// visitor.hpp +// visitor.h // particle_combined // // Created by Sebastian Holzki on 11.06.19.