„.gitignore“ ändern

.gitignore

@@ -32,7 +32,7 @@
 *.DS_Store
 *.Makefile
 Project.xcconfig
-*.make
+
 /makefile
 *.xcodeproj
 *.perspective
@@ -90,5 +90,4 @@ Thumbs.db
 Desktop.ini
 
 # Android
-.csettings
-/.vs/Projekt_FORUM/v15
+.csettings

.vs/ProjectSettings.json

@@ -1,3 +0,0 @@
-{
-  "CurrentProjectSetting": "No Configurations"
-}

.vs/VSWorkspaceState.json

@@ -1,7 +0,0 @@
-{
-  "ExpandedNodes": [
-    "",
-    "\\src"
-  ],
-  "PreviewInSolutionExplorer": false
-}

Projekt_FORUM.vcxproj.user

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LocalDebuggerWorkingDirectory>$(ProjectDir)/bin</LocalDebuggerWorkingDirectory>
-    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LocalDebuggerWorkingDirectory>$(ProjectDir)/bin</LocalDebuggerWorkingDirectory>
-    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LocalDebuggerWorkingDirectory>$(ProjectDir)/bin</LocalDebuggerWorkingDirectory>
-    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LocalDebuggerWorkingDirectory>$(ProjectDir)/bin</LocalDebuggerWorkingDirectory>
-    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
-  </PropertyGroup>
-</Project>

src/avatar.cpp

@@ -5,7 +5,7 @@
 //  Created by Sebastian Holzki on 17.04.19.
 //
 
-#include "avatar.h"
+#include "avatar.hpp"
 
 
 

src/avatar.hpp

@@ -1,5 +1,5 @@
 //
-//  avatar.h
+//  avatar.hpp
 //  emptyExample
 //
 //  Created by Sebastian Holzki on 17.04.19.

src/greatWhole.cpp

@@ -5,8 +5,8 @@
 //  Created by Sebastian Holzki on 17.04.19.
 //
 
-#include "greatWhole.h"
-#include "avatar.h"
+#include "greatWhole.hpp"
+#include "avatar.hpp"
 
 
 

src/greatWhole.hpp

@@ -1,5 +1,5 @@
 //
-//  greatWhole.h
+//  greatWhole.hpp
 //  emptyExample
 //
 //  Created by Sebastian Holzki on 17.04.19.
@@ -7,7 +7,7 @@
 
 #include <stdio.h>
 #include "ofMain.h"
-#include "avatar.h"
+#include "avatar.hpp"
 
 #pragma once
 

src/main.cpp

@@ -6,12 +6,10 @@
 int main( ){
 
 	ofSetupOpenGL(1000,1000, OF_WINDOW);			// <-------- setup the GL context
-	ofGLFWWindowSettings settings;
-	settings.setGLVersion(3, 2);
-	settings.setSize(1280, 800);
-	ofCreateWindow(settings);
 
-	ofRunApp(new ofApp());
+	// this kicks off the running of my app
+	// can be OF_WINDOW or OF_FULLSCREEN
+	// pass in width and height too:
 	ofRunApp( new ofApp());
 
 }

src/objectPhysics.cpp

@@ -5,7 +5,7 @@
 //  Created by Sebastian Holzki on 11.06.19.
 //
 
-#include "objectPhysics.h"
+#include "objectPhysics.hpp"
 
 
 
@@ -31,6 +31,11 @@ ObjectPhysics::~ObjectPhysics()
 
 Attraktor::Attraktor(){
     
+    
+            emitting = false;
+            attracting = true;
+    
+            cout << "Attraktor Konstruktor" << endl;
    
 };
 

src/objectPhysics.hpp

@@ -1,16 +1,16 @@
 //
-//  objectPhysics.h
+//  objectPhysics.hpp
 //  emptyExample
 //
 //  Created by Sebastian Holzki on 01.05.19.
 //
 
-#ifndef objectPhysics_h
-#define objectPhysics_h
+#ifndef objectPhysics_hpp
+#define objectPhysics_hpp
 
 #include <stdio.h>
 #include "ofMain.h"
-#endif /* objectPhysics_h */
+#endif /* objectPhysics_hpp */
 
 
 class ObjectPhysics {

src/ofApp.h

@@ -1,17 +1,17 @@
 #pragma once
 
 #include "ofMain.h"
-#include "particleSystem.h"
-#include "greatWhole.h"
-#include "avatar.h"
+#include "particleSystem.hpp"
+#include "greatWhole.hpp"
+#include "avatar.hpp"
 #include "ofxOsc.h"
-#include "visitor.h"
-#include "objectPhysics.h"
-#include "particle.h"
+#include "visitor.hpp"
+#include "objectPhysics.hpp"
+#include "particle.hpp"
 
     
-    //int WINDOWSIZE_WIDTH = 1000;
-    //int WINDOWSIZE_HEIGHT = 1000;
+    int WINDOWSIZE_WIDTH = 1000;
+    int WINDOWSIZE_HEIGHT = 1000;
 
 
 

src/particle.cpp

@@ -5,7 +5,7 @@
 //  Created by Sebastian Holzki on 16.04.19.
 //
 
-#include "particle.h"
+#include "particle.hpp"
 
 
 

src/particle.hpp

@@ -1,5 +1,5 @@
 //
-//  particle.h
+//  particle.hpp
 //
 //  Created by Sebastian Holzki on 16.04.19.
 //

src/particleSystem.cpp

@@ -5,7 +5,7 @@
 //  Created by Sebastian Holzki on 16.04.19.
 //
 
-#include "particleSystem.h"
+#include "particleSystem.hpp"
 
 
 

src/particleSystem.hpp

@@ -1,5 +1,5 @@
 //
-//  particleSystem.h
+//  particleSystem.hpp
 //  emptyExample
 //
 //  Created by Sebastian Holzki on 16.04.19.
@@ -10,7 +10,7 @@
 #include <stdio.h>
 
 
-#include "particle.h"
+#include "particle.hpp"
 
 
 

src/visitor.cpp

@@ -5,7 +5,7 @@
 //  Created by Sebastian Holzki on 11.06.19.
 //
 
-#include "visitor.h"
+#include "visitor.hpp"
 
 
 
@@ -133,3 +133,33 @@ void Visitor::setY(float _y){
 }
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

src/visitor.hpp

@@ -1,5 +1,5 @@
 //
-//  visitor.h
+//  visitor.hpp
 //  particle_combined
 //
 //  Created by Sebastian Holzki on 11.06.19.