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 0000000..ab06680
Binary files /dev/null and b/.vs/slnx.sqlite differ
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.