Browse Source

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

windows
Katharina Ott 5 years ago
parent
commit
9f2a0d43f4

+ 2
- 1
.gitignore View File

@@ -90,4 +90,5 @@ Thumbs.db
Desktop.ini

# Android
.csettings
.csettings
/.vs/Projekt_FORUM/v15

+ 3
- 0
.vs/ProjectSettings.json View File

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

+ 7
- 0
.vs/VSWorkspaceState.json View File

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

BIN
.vs/slnx.sqlite View File


+ 19
- 0
Projekt_FORUM.vcxproj.user 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
src/avatar.cpp View File

@@ -5,7 +5,7 @@
// Created by Sebastian Holzki on 17.04.19.
//

#include "avatar.hpp"
#include "avatar.h"




src/avatar.hpp → src/avatar.h View File

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

+ 2
- 2
src/greatWhole.cpp View File

@@ -5,8 +5,8 @@
// Created by Sebastian Holzki on 17.04.19.
//

#include "greatWhole.hpp"
#include "avatar.hpp"
#include "greatWhole.h"
#include "avatar.h"




src/greatWhole.hpp → src/greatWhole.h View File

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

#include <stdio.h>
#include "ofMain.h"
#include "avatar.hpp"
#include "avatar.h"

#pragma once


+ 5
- 3
src/main.cpp View File

@@ -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());

}

+ 1
- 1
src/objectPhysics.cpp View File

@@ -5,7 +5,7 @@
// Created by Sebastian Holzki on 11.06.19.
//

#include "objectPhysics.hpp"
#include "objectPhysics.h"




src/objectPhysics.hpp → src/objectPhysics.h View File

@@ -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 <stdio.h>
#include "ofMain.h"
#endif /* objectPhysics_hpp */
#endif /* objectPhysics_h */


class ObjectPhysics {

+ 8
- 8
src/ofApp.h View File

@@ -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;




+ 1
- 1
src/particle.cpp View File

@@ -5,7 +5,7 @@
// Created by Sebastian Holzki on 16.04.19.
//

#include "particle.hpp"
#include "particle.h"




src/particle.hpp → src/particle.h View File

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

+ 1
- 1
src/particleSystem.cpp View File

@@ -5,7 +5,7 @@
// Created by Sebastian Holzki on 16.04.19.
//

#include "particleSystem.hpp"
#include "particleSystem.h"




src/particleSystem.hpp → src/particleSystem.h View File

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


#include "particle.hpp"
#include "particle.h"




+ 1
- 1
src/visitor.cpp View File

@@ -5,7 +5,7 @@
// Created by Sebastian Holzki on 11.06.19.
//

#include "visitor.hpp"
#include "visitor.h"




src/visitor.hpp → src/visitor.h View File

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

Loading…
Cancel
Save