Skip to content

GitLab

C
creativeProjects2
Commit f98436f3 authored by Kevin Dang's avatar Kevin Dang
Browse files
Options

removed worldobject class

parent 0ebd643a
Hide whitespace changes
Inline Side-by-side
Showing with 40 additions and 40 deletions
Lux/Lux.xcodeproj/project.pbxproj
View file @ f98436f3
......@@ -7,6 +7,10 @@
objects = {
/* Begin PBXBuildFile section */
0A08A9321CC5350D00153E01 /* flocking.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0A08A9281CC5350D00153E01 /* flocking.cpp */; };
0A08A9331CC5350D00153E01 /* lightBalls.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0A08A92A1CC5350D00153E01 /* lightBalls.cpp */; };
0A08A9341CC5350D00153E01 /* populateSmallSphere.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0A08A92C1CC5350D00153E01 /* populateSmallSphere.cpp */; };
0A08A9351CC5350D00153E01 /* smallSphereObject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0A08A92E1CC5350D00153E01 /* smallSphereObject.cpp */; };
1CD33E884D9E3358252E82A1 /* ofxToggle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 907C5B5E104864A2D3A25745 /* ofxToggle.cpp */; };
483908258D00B98B4BE69F07 /* ofxLabel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 78D67A00EB899FAC09430597 /* ofxLabel.cpp */; };
4F04D6251CBD1ED70092E1D7 /* lightDrawing.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F04D6231CBD1ED70092E1D7 /* lightDrawing.cpp */; };
......@@ -52,6 +56,14 @@
/* End PBXCopyFilesBuildPhase section */
/* Begin PBXFileReference section */
0A08A9281CC5350D00153E01 /* flocking.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = flocking.cpp; sourceTree = "<group>"; };
0A08A9291CC5350D00153E01 /* flocking.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = flocking.h; sourceTree = "<group>"; };
0A08A92A1CC5350D00153E01 /* lightBalls.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lightBalls.cpp; sourceTree = "<group>"; };
0A08A92B1CC5350D00153E01 /* lightBalls.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lightBalls.h; sourceTree = "<group>"; };
0A08A92C1CC5350D00153E01 /* populateSmallSphere.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = populateSmallSphere.cpp; sourceTree = "<group>"; };
0A08A92D1CC5350D00153E01 /* populateSmallSphere.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = populateSmallSphere.h; sourceTree = "<group>"; };
0A08A92E1CC5350D00153E01 /* smallSphereObject.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = smallSphereObject.cpp; sourceTree = "<group>"; };
0A08A92F1CC5350D00153E01 /* smallSphereObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = smallSphereObject.h; sourceTree = "<group>"; };
0A1DAC09F322AE313A40706D /* ofxToggle.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = ofxToggle.h; path = ../../../addons/ofxGui/src/ofxToggle.h; sourceTree = SOURCE_ROOT; };
15F2C6477A769C03A56D1401 /* ofxSlider.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = ofxSlider.cpp; path = ../../../addons/ofxGui/src/ofxSlider.cpp; sourceTree = SOURCE_ROOT; };
17E65988300FBD9AAA2CD0CA /* ofxGui.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = ofxGui.h; path = ../../../addons/ofxGui/src/ofxGui.h; sourceTree = SOURCE_ROOT; };
......@@ -95,6 +107,28 @@
/* End PBXFrameworksBuildPhase section */
/* Begin PBXGroup section */
0A08A9381CC5352400153E01 /* World Objects */ = {
isa = PBXGroup;
children = (
0A08A92A1CC5350D00153E01 /* lightBalls.cpp */,
0A08A92B1CC5350D00153E01 /* lightBalls.h */,
0A08A92C1CC5350D00153E01 /* populateSmallSphere.cpp */,
0A08A92D1CC5350D00153E01 /* populateSmallSphere.h */,
);
name = "World Objects";
sourceTree = "<group>";
};
0A08A9391CC5353500153E01 /* Miscellaneous */ = {
isa = PBXGroup;
children = (
0A08A9281CC5350D00153E01 /* flocking.cpp */,
0A08A9291CC5350D00153E01 /* flocking.h */,
0A08A92E1CC5350D00153E01 /* smallSphereObject.cpp */,
0A08A92F1CC5350D00153E01 /* smallSphereObject.h */,
);
name = Miscellaneous;
sourceTree = "<group>";
};
480A780D8D0308AE4A368801 /* ofxGui */ = {
isa = PBXGroup;
children = (
......@@ -173,6 +207,8 @@
E4B69E1D0A3A1BDC003C02F2 /* main.cpp */,
E4B69E1E0A3A1BDC003C02F2 /* ofApp.cpp */,
E4B69E1F0A3A1BDC003C02F2 /* ofApp.h */,
0A08A9391CC5353500153E01 /* Miscellaneous */,
0A08A9381CC5352400153E01 /* World Objects */,
);
path = src;
sourceTree = SOURCE_ROOT;
......@@ -278,13 +314,17 @@
856AA354D08AB4B323081444 /* ofxBaseGui.cpp in Sources */,
5CBB2AB3A60F65431D7B555D /* ofxButton.cpp in Sources */,
B266578FC55D23BFEBC042E7 /* ofxGuiGroup.cpp in Sources */,
0A08A9341CC5350D00153E01 /* populateSmallSphere.cpp in Sources */,
483908258D00B98B4BE69F07 /* ofxLabel.cpp in Sources */,
F285EB3169F1566CA3D93C20 /* ofxPanel.cpp in Sources */,
837220E80EB56CD44AD27F2A /* ofxSlider.cpp in Sources */,
4F04D6251CBD1ED70092E1D7 /* lightDrawing.cpp in Sources */,
4F72D8D31CBE8F19000E43E6 /* Gui.cpp in Sources */,
B56FE57CC35806596D38118C /* ofxSliderGroup.cpp in Sources */,
0A08A9331CC5350D00153E01 /* lightBalls.cpp in Sources */,
0A08A9351CC5350D00153E01 /* smallSphereObject.cpp in Sources */,
1CD33E884D9E3358252E82A1 /* ofxToggle.cpp in Sources */,
0A08A9321CC5350D00153E01 /* flocking.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
......
Lux/src/worldObjects.cpp deleted 100644 → 0
View file @ 0ebd643a
//
// worldObjects.cpp
// Lux
//
// Created by Dat Nguyen & Kevin Dang
//
//
#include <stdio.h>
#include "worldObjects.h"
\ No newline at end of file
Lux/src/worldObjects.h deleted 100644 → 0
View file @ 0ebd643a
//
// worldObjects.h
// Lux
//
// Created by Dat Nguyen & Kevin Dang
//
//
#ifndef worldObjects_h
#define worldObjects_h
#include "ofMain.h"
class worldObjects {
protected:
public:
};
class boxObjects: public worldObjects {
};
class sphereLightObjects: public worldObjects {
};
#endif /* worldObjects_h */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment