Skip to content

Commit

Permalink
Added make files, gitignore and updated the main base files
Browse files Browse the repository at this point in the history
  • Loading branch information
Nr!q committed Jan 15, 2016
1 parent b760265 commit cdb19d8
Show file tree
Hide file tree
Showing 10 changed files with 340 additions and 206 deletions.
Empty file added .gitignore
Empty file.
13 changes: 13 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# Attempt to load a config.make file.
# If none is found, project defaults in config.project.make will be used.
ifneq ($(wildcard config.make),)
include config.make
endif

# make sure the the OF_ROOT location is defined
ifndef OF_ROOT
OF_ROOT=$(realpath ../../..)
endif

# call the project makefile!
include $(OF_ROOT)/libs/openFrameworksCompiled/project/makefileCommon/compile.project.mk
3 changes: 3 additions & 0 deletions addons.make
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
ofxXmlSettings
ofxOpenCv
ofxBox2d
141 changes: 141 additions & 0 deletions config.make
Original file line number Diff line number Diff line change
@@ -0,0 +1,141 @@
################################################################################
# CONFIGURE PROJECT MAKEFILE (optional)
# This file is where we make project specific configurations.
################################################################################

################################################################################
# OF ROOT
# The location of your root openFrameworks installation
# (default) OF_ROOT = ../../..
################################################################################
# OF_ROOT = ../../..

################################################################################
# PROJECT ROOT
# The location of the project - a starting place for searching for files
# (default) PROJECT_ROOT = . (this directory)
#
################################################################################
# PROJECT_ROOT = .

################################################################################
# PROJECT SPECIFIC CHECKS
# This is a project defined section to create internal makefile flags to
# conditionally enable or disable the addition of various features within
# this makefile. For instance, if you want to make changes based on whether
# GTK is installed, one might test that here and create a variable to check.
################################################################################
# None

################################################################################
# PROJECT EXTERNAL SOURCE PATHS
# These are fully qualified paths that are not within the PROJECT_ROOT folder.
# Like source folders in the PROJECT_ROOT, these paths are subject to
# exlclusion via the PROJECT_EXLCUSIONS list.
#
# (default) PROJECT_EXTERNAL_SOURCE_PATHS = (blank)
#
# Note: Leave a leading space when adding list items with the += operator
################################################################################
# PROJECT_EXTERNAL_SOURCE_PATHS =

################################################################################
# PROJECT EXCLUSIONS
# These makefiles assume that all folders in your current project directory
# and any listed in the PROJECT_EXTERNAL_SOURCH_PATHS are are valid locations
# to look for source code. The any folders or files that match any of the
# items in the PROJECT_EXCLUSIONS list below will be ignored.
#
# Each item in the PROJECT_EXCLUSIONS list will be treated as a complete
# string unless teh user adds a wildcard (%) operator to match subdirectories.
# GNU make only allows one wildcard for matching. The second wildcard (%) is
# treated literally.
#
# (default) PROJECT_EXCLUSIONS = (blank)
#
# Will automatically exclude the following:
#
# $(PROJECT_ROOT)/bin%
# $(PROJECT_ROOT)/obj%
# $(PROJECT_ROOT)/%.xcodeproj
#
# Note: Leave a leading space when adding list items with the += operator
################################################################################
# PROJECT_EXCLUSIONS =

################################################################################
# PROJECT LINKER FLAGS
# These flags will be sent to the linker when compiling the executable.
#
# (default) PROJECT_LDFLAGS = -Wl,-rpath=./libs
#
# Note: Leave a leading space when adding list items with the += operator
#
# Currently, shared libraries that are needed are copied to the
# $(PROJECT_ROOT)/bin/libs directory. The following LDFLAGS tell the linker to
# add a runtime path to search for those shared libraries, since they aren't
# incorporated directly into the final executable application binary.
################################################################################
# PROJECT_LDFLAGS=-Wl,-rpath=./libs

################################################################################
# PROJECT DEFINES
# Create a space-delimited list of DEFINES. The list will be converted into
# CFLAGS with the "-D" flag later in the makefile.
#
# (default) PROJECT_DEFINES = (blank)
#
# Note: Leave a leading space when adding list items with the += operator
################################################################################
# PROJECT_DEFINES =

################################################################################
# PROJECT CFLAGS
# This is a list of fully qualified CFLAGS required when compiling for this
# project. These CFLAGS will be used IN ADDITION TO the PLATFORM_CFLAGS
# defined in your platform specific core configuration files. These flags are
# presented to the compiler BEFORE the PROJECT_OPTIMIZATION_CFLAGS below.
#
# (default) PROJECT_CFLAGS = (blank)
#
# Note: Before adding PROJECT_CFLAGS, note that the PLATFORM_CFLAGS defined in
# your platform specific configuration file will be applied by default and
# further flags here may not be needed.
#
# Note: Leave a leading space when adding list items with the += operator
################################################################################
# PROJECT_CFLAGS =

################################################################################
# PROJECT OPTIMIZATION CFLAGS
# These are lists of CFLAGS that are target-specific. While any flags could
# be conditionally added, they are usually limited to optimization flags.
# These flags are added BEFORE the PROJECT_CFLAGS.
#
# PROJECT_OPTIMIZATION_CFLAGS_RELEASE flags are only applied to RELEASE targets.
#
# (default) PROJECT_OPTIMIZATION_CFLAGS_RELEASE = (blank)
#
# PROJECT_OPTIMIZATION_CFLAGS_DEBUG flags are only applied to DEBUG targets.
#
# (default) PROJECT_OPTIMIZATION_CFLAGS_DEBUG = (blank)
#
# Note: Before adding PROJECT_OPTIMIZATION_CFLAGS, please note that the
# PLATFORM_OPTIMIZATION_CFLAGS defined in your platform specific configuration
# file will be applied by default and further optimization flags here may not
# be needed.
#
# Note: Leave a leading space when adding list items with the += operator
################################################################################
# PROJECT_OPTIMIZATION_CFLAGS_RELEASE =
# PROJECT_OPTIMIZATION_CFLAGS_DEBUG =

################################################################################
# PROJECT COMPILERS
# Custom compilers can be set for CC and CXX
# (default) PROJECT_CXX = (blank)
# (default) PROJECT_CC = (blank)
# Note: Leave a leading space when adding list items with the += operator
################################################################################
# PROJECT_CXX =
# PROJECT_CC =
138 changes: 138 additions & 0 deletions src/gaApp.cc
Original file line number Diff line number Diff line change
@@ -0,0 +1,138 @@
#include "gaApp.h"

//--------------------------------------------------------------
void gaApp::setup()
{
ofSetFrameRate(30);
ofBackground(0, 0, 0);
bMouseVisible = true;

manager.setup();
}

//--------------------------------------------------------------
void gaApp::update()
{
switch( manager.mode ) {
case GA_MODE_START:
manager.update();
break;
case GA_MODE_RECORDER: break;
case GA_MODE_PLAYER:
if (! gaInteractiveApp.bSetup)
gaInteractiveApp.setup();
else
gaInteractiveApp.update();
break;
case GA_MODE_LASER: break;
}
}

//--------------------------------------------------------------
void gaApp::draw()
{
switch( manager.mode ) {
case GA_MODE_START:
manager.draw();
break;
case GA_MODE_RECORDER:
glPushMatrix();
glTranslatef( ofGetWidth()/2, ofGetHeight()/2, 0 );
ofDrawBitmapString( "Recorder: Not ready yet.", 0, 0 );
glPopMatrix();
break;
case GA_MODE_PLAYER:
if (gaInteractiveApp.bSetup)
gaInteractiveApp.draw();
break;
case GA_MODE_LASER: break;
}
}

//--------------------------------------------------------------
void gaApp::keyPressed(int key)
{
switch (key) {
case OF_KEY_F1:
manager.setMode( GA_MODE_START );
break;
//case OF_KEY_F2:
//manager.setMode( GA_MODE_RECORDER );
//break;
//case OF_KEY_F3:
//manager.setMode( GA_MODE_PLAYER );
//break;
//case OF_KEY_F4:
//manager.setMode( GA_MODE_LASER );
//break;
}

if (! gaInteractiveApp.panel.isAnyTextBoxActive() ||
manager.mode != GA_MODE_PLAYER
) {
if ( key == 'f' || key == 'F' ) ofToggleFullscreen();
}
}

//--------------------------------------------------------------
void gaApp::keyReleased(int key)
{

}

//--------------------------------------------------------------
void gaApp::mouseMoved(int x, int y)
{

}

//--------------------------------------------------------------
void gaApp::mouseDragged(int x, int y, int button)
{

}

//--------------------------------------------------------------
void gaApp::mousePressed(int x, int y, int button)
{
if (manager.mode == GA_MODE_START) {
int hi = manager.hitTest(x, y);
if (hi >= 0) manager.setMode(hi);
}
}

//--------------------------------------------------------------
void gaApp::mouseReleased(int x, int y, int button)
{

}

//--------------------------------------------------------------
void gaApp::mouseEntered(int x, int y)
{

}

//--------------------------------------------------------------
void gaApp::mouseExited(int x, int y)
{

}

//--------------------------------------------------------------
void gaApp::windowResized(int w, int h)
{

}

//--------------------------------------------------------------
void gaApp::gotMessage(ofMessage msg)
{

}

//--------------------------------------------------------------
void gaApp::dragEvent(ofDragInfo dragInfo)
{

}
32 changes: 32 additions & 0 deletions src/gaApp.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
#pragma once

#include "ofMain.h"
#include "gaManagerApp.h"
#include "gaPlayerApp.h"
//#include "gaLaserApp.h"

class gaApp : public ofBaseApp
{
public:
void setup();
void update();
void draw();

void keyPressed (int key);
void keyReleased (int key);
void mouseMoved (int x, int y);
void mouseDragged (int x, int y, int button);
void mousePressed (int x, int y, int button);
void mouseReleased (int x, int y, int button);
void mouseEntered (int x, int y);
void mouseExited (int x, int y);
void windowResized (int w, int h);
void dragEvent (ofDragInfo dragInfo);
void gotMessage (ofMessage msg);

GaManagerApp manager;
GaPlayerApp gaInteractiveApp;
//GaLaserApp gaLaserApp;

bool bMouseVisible;
};
13 changes: 13 additions & 0 deletions src/main.cc
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
#include "ofMain.h"
#include "gaApp.h"

//--------------------------------------------------------------
int main()
{
ofSetupOpenGL(1024, 768, OF_WINDOW); // <-------- setup the GL context

// this kicks off the running of my app
// can be OF_WINDOW or OF_FULLSCREEN
// pass in width and height too:
ofRunApp(new gaApp());
}
16 changes: 0 additions & 16 deletions src/main.cpp

This file was deleted.

Loading

0 comments on commit cdb19d8

Please sign in to comment.