Skip to content

week5&6 hw #61

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
shuanghuo1 wants to merge 4 commits into
base: master
Choose a base branch
from
Open

week5&6 hw #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0b0ce0a
week5&6 hw
shuanghuo1 Mar 12, 2014
29244e3
Commit Work
shuanghuo1 Mar 26, 2014
ecfc011
Mid
shuanghuo1 Apr 2, 2014
2e0e3ff
for4.9 & 4.16
shuanghuo1 Apr 16, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
Binary file modified ...W.xcodeproj/project.xcworkspace/xcuserdata/hss.xcuserdatad/UserInterfaceState.xcuserstate
View file
Open in desktop
Binary file not shown.
Binary file modified ShuangshuangHuo/Week4HW/bin/Week4HW.app/Contents/MacOS/Week4HW
View file
Open in desktop
Binary file not shown.
5 changes: 4 additions & 1 deletion ShuangshuangHuo/Week4HW/src/testApp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ void testApp::draw(){

//--------------

void testApp::star(float x,float y, float radius1, float points){
void testApp::star(float x,float y, float radius1, float points){ //ofSetPolyMode(int mode)
float angle = TWO_PI / points;
float halfAngle = angle/2.0;
float radius2=radius1/5*2;
Expand All @@ -42,10 +42,13 @@ void testApp::star(float x,float y, float radius1, float points){
ofVertex(sx, sy);
}
ofEndShape();

}





//--------------------------------------------------------------
void testApp::keyPressed(int key){

Expand Down
13 changes: 13 additions & 0 deletions ShuangshuangHuo/Week5HW/Makefile
View file
Open in desktop
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=../../..
endif

# call the project makefile!
include $(OF_ROOT)/libs/openFrameworksCompiled/project/makefileCommon/compile.project.mk
17 changes: 17 additions & 0 deletions ShuangshuangHuo/Week5HW/Project.xcconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
//THE PATH TO THE ROOT OF OUR OF PATH RELATIVE TO THIS PROJECT.
//THIS NEEDS TO BE DEFINED BEFORE CoreOF.xcconfig IS INCLUDED
OF_PATH = ../../..

//THIS HAS ALL THE HEADER AND LIBS FOR OF CORE
#include "../../../libs/openFrameworksCompiled/project/osx/CoreOF.xcconfig"

//ICONS - NEW IN 0072
ICON_NAME_DEBUG = icon-debug.icns
ICON_NAME_RELEASE = icon.icns
ICON_FILE_PATH = $(OF_PATH)/libs/openFrameworksCompiled/project/osx/

//IF YOU WANT AN APP TO HAVE A CUSTOM ICON - PUT THEM IN YOUR DATA FOLDER AND CHANGE ICON_FILE_PATH to:
//ICON_FILE_PATH = bin/data/

OTHER_LDFLAGS = $(OF_CORE_LIBS)
HEADER_SEARCH_PATHS = $(OF_CORE_HEADERS)
Loading