changed .hpp to .h + addons for other stuff + make it work on windows

This commit is contained in:
Katharina Ott
2019-06-12 18:19:10 +02:00
parent 0332890265
commit 9f2a0d43f4
19 changed files with 62 additions and 30 deletions
+1
View File
@@ -91,3 +91,4 @@ Desktop.ini
# Android # Android
.csettings .csettings
/.vs/Projekt_FORUM/v15
+3
View File
@@ -0,0 +1,3 @@
{
"CurrentProjectSetting": "No Configurations"
}
+7
View File
@@ -0,0 +1,7 @@
{
"ExpandedNodes": [
"",
"\\src"
],
"PreviewInSolutionExplorer": false
}
BIN
View File
Binary file not shown.
+19
View File
@@ -0,0 +1,19 @@
<?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>
+1 -1
View File
@@ -5,7 +5,7 @@
// Created by Sebastian Holzki on 17.04.19. // Created by Sebastian Holzki on 17.04.19.
// //
#include "avatar.hpp" #include "avatar.h"
+1 -1
View File
@@ -1,5 +1,5 @@
// //
// avatar.hpp // avatar.h
// emptyExample // emptyExample
// //
// Created by Sebastian Holzki on 17.04.19. // Created by Sebastian Holzki on 17.04.19.
+2 -2
View File
@@ -5,8 +5,8 @@
// Created by Sebastian Holzki on 17.04.19. // Created by Sebastian Holzki on 17.04.19.
// //
#include "greatWhole.hpp" #include "greatWhole.h"
#include "avatar.hpp" #include "avatar.h"
+2 -2
View File
@@ -1,5 +1,5 @@
// //
// greatWhole.hpp // greatWhole.h
// emptyExample // emptyExample
// //
// Created by Sebastian Holzki on 17.04.19. // Created by Sebastian Holzki on 17.04.19.
@@ -7,7 +7,7 @@
#include <stdio.h> #include <stdio.h>
#include "ofMain.h" #include "ofMain.h"
#include "avatar.hpp" #include "avatar.h"
#pragma once #pragma once
+5 -3
View File
@@ -6,10 +6,12 @@
int main( ){ int main( ){
ofSetupOpenGL(1000,1000, OF_WINDOW); // <-------- setup the GL context 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 ofRunApp(new ofApp());
// can be OF_WINDOW or OF_FULLSCREEN
// pass in width and height too:
ofRunApp( new ofApp()); ofRunApp( new ofApp());
} }
+1 -1
View File
@@ -5,7 +5,7 @@
// Created by Sebastian Holzki on 11.06.19. // Created by Sebastian Holzki on 11.06.19.
// //
#include "objectPhysics.hpp" #include "objectPhysics.h"
@@ -1,16 +1,16 @@
// //
// objectPhysics.hpp // objectPhysics.h
// emptyExample // emptyExample
// //
// Created by Sebastian Holzki on 01.05.19. // Created by Sebastian Holzki on 01.05.19.
// //
#ifndef objectPhysics_hpp #ifndef objectPhysics_h
#define objectPhysics_hpp #define objectPhysics_h
#include <stdio.h> #include <stdio.h>
#include "ofMain.h" #include "ofMain.h"
#endif /* objectPhysics_hpp */ #endif /* objectPhysics_h */
class ObjectPhysics { class ObjectPhysics {
+8 -8
View File
@@ -1,17 +1,17 @@
#pragma once #pragma once
#include "ofMain.h" #include "ofMain.h"
#include "particleSystem.hpp" #include "particleSystem.h"
#include "greatWhole.hpp" #include "greatWhole.h"
#include "avatar.hpp" #include "avatar.h"
#include "ofxOsc.h" #include "ofxOsc.h"
#include "visitor.hpp" #include "visitor.h"
#include "objectPhysics.hpp" #include "objectPhysics.h"
#include "particle.hpp" #include "particle.h"
int WINDOWSIZE_WIDTH = 1000; //int WINDOWSIZE_WIDTH = 1000;
int WINDOWSIZE_HEIGHT = 1000; //int WINDOWSIZE_HEIGHT = 1000;
+1 -1
View File
@@ -5,7 +5,7 @@
// Created by Sebastian Holzki on 16.04.19. // Created by Sebastian Holzki on 16.04.19.
// //
#include "particle.hpp" #include "particle.h"
+1 -1
View File
@@ -1,5 +1,5 @@
// //
// particle.hpp // particle.h
// //
// Created by Sebastian Holzki on 16.04.19. // Created by Sebastian Holzki on 16.04.19.
// //
+1 -1
View File
@@ -5,7 +5,7 @@
// Created by Sebastian Holzki on 16.04.19. // Created by Sebastian Holzki on 16.04.19.
// //
#include "particleSystem.hpp" #include "particleSystem.h"
@@ -1,5 +1,5 @@
// //
// particleSystem.hpp // particleSystem.h
// emptyExample // emptyExample
// //
// Created by Sebastian Holzki on 16.04.19. // Created by Sebastian Holzki on 16.04.19.
@@ -10,7 +10,7 @@
#include <stdio.h> #include <stdio.h>
#include "particle.hpp" #include "particle.h"
+1 -1
View File
@@ -5,7 +5,7 @@
// Created by Sebastian Holzki on 11.06.19. // Created by Sebastian Holzki on 11.06.19.
// //
#include "visitor.hpp" #include "visitor.h"
+1 -1
View File
@@ -1,5 +1,5 @@
// //
// visitor.hpp // visitor.h
// particle_combined // particle_combined
// //
// Created by Sebastian Holzki on 11.06.19. // Created by Sebastian Holzki on 11.06.19.