Skip to content

Fix deprecated draw calls #131

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
prisonerjohn wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Fix deprecated draw calls #131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b81e4eb
Fixed deprecated draw calls.
prisonerjohn Apr 7, 2016
84f53b1
Updated deprecated draw calls, lots of find and replace!
prisonerjohn Apr 7, 2016
e41b219
Updated curvesAndColors example, added solution for VS 2015.
prisonerjohn Apr 7, 2016
c113759
Merge branch 'master' into fix-deprecated
prisonerjohn Apr 7, 2016
92d7e73
Added copy data phase to ofxTimelineLib props.
prisonerjohn Jun 13, 2016
949b419
Fix bug in setDurationInSeconds() when recalculating new in/out points
mattfelsen Jun 20, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 27 additions & 14 deletions example-curvesAndColors/example-curvesAndColors.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,36 @@
Microsoft Visual Studio Solution File, Format Version 11.00
# Visual C++ Express 2010
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example-curvesAndColors", "example-curvesAndColors.vcxproj", "{7FD42DF7-442E-479A-BA76-D0022F99702A}"

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.24720.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openFrameworksLib", "..\..\..\libs\openFrameworksCompiled\project\vs\openFrameworksLib.vcxproj", "{5837595D-ACA9-485C-8E76-729040CE4B0B}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openframeworksLib", "..\..\..\libs\openFrameworksCompiled\project\vs2010\openframeworksLib.vcxproj", "{5837595D-ACA9-485C-8E76-729040CE4B0B}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example-curvesAndColors", "example-curvesAndColors.vcxproj", "{7FD42DF7-442E-479A-BA76-D0022F99702A}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Release|Win32 = Release|Win32
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{7FD42DF7-442E-479A-BA76-D0022F99702A}.Debug|Win32.ActiveCfg = Debug|Win32
{7FD42DF7-442E-479A-BA76-D0022F99702A}.Debug|Win32.Build.0 = Debug|Win32
{7FD42DF7-442E-479A-BA76-D0022F99702A}.Release|Win32.ActiveCfg = Release|Win32
{7FD42DF7-442E-479A-BA76-D0022F99702A}.Release|Win32.Build.0 = Release|Win32
{5837595D-ACA9-485C-8E76-729040CE4B0B}.Debug|Win32.ActiveCfg = Debug|Win32
{5837595D-ACA9-485C-8E76-729040CE4B0B}.Debug|Win32.Build.0 = Debug|Win32
{5837595D-ACA9-485C-8E76-729040CE4B0B}.Release|Win32.ActiveCfg = Release|Win32
{5837595D-ACA9-485C-8E76-729040CE4B0B}.Release|Win32.Build.0 = Release|Win32
{5837595D-ACA9-485C-8E76-729040CE4B0B}.Debug|x64.ActiveCfg = Debug|x64
{5837595D-ACA9-485C-8E76-729040CE4B0B}.Debug|x64.Build.0 = Debug|x64
{5837595D-ACA9-485C-8E76-729040CE4B0B}.Debug|x86.ActiveCfg = Debug|Win32
{5837595D-ACA9-485C-8E76-729040CE4B0B}.Debug|x86.Build.0 = Debug|Win32
{5837595D-ACA9-485C-8E76-729040CE4B0B}.Release|x64.ActiveCfg = Release|x64
{5837595D-ACA9-485C-8E76-729040CE4B0B}.Release|x64.Build.0 = Release|x64
{5837595D-ACA9-485C-8E76-729040CE4B0B}.Release|x86.ActiveCfg = Release|Win32
{5837595D-ACA9-485C-8E76-729040CE4B0B}.Release|x86.Build.0 = Release|Win32
{7FD42DF7-442E-479A-BA76-D0022F99702A}.Debug|x64.ActiveCfg = Debug|x64
{7FD42DF7-442E-479A-BA76-D0022F99702A}.Debug|x64.Build.0 = Debug|x64
{7FD42DF7-442E-479A-BA76-D0022F99702A}.Debug|x86.ActiveCfg = Debug|Win32
{7FD42DF7-442E-479A-BA76-D0022F99702A}.Debug|x86.Build.0 = Debug|Win32
{7FD42DF7-442E-479A-BA76-D0022F99702A}.Release|x64.ActiveCfg = Release|x64
{7FD42DF7-442E-479A-BA76-D0022F99702A}.Release|x64.Build.0 = Release|x64
{7FD42DF7-442E-479A-BA76-D0022F99702A}.Release|x86.ActiveCfg = Release|Win32
{7FD42DF7-442E-479A-BA76-D0022F99702A}.Release|x86.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
Binary file removed example-curvesAndColors/example-curvesAndColors.suo
View file
Open in desktop
Binary file not shown.
389 changes: 235 additions & 154 deletions example-curvesAndColors/example-curvesAndColors.vcxproj
View file
Open in desktop

Large diffs are not rendered by default.

359 changes: 136 additions & 223 deletions example-curvesAndColors/example-curvesAndColors.vcxproj.filters
View file
Open in desktop

Large diffs are not rendered by default.

11 changes: 0 additions & 11 deletions example-curvesAndColors/example-curvesAndColors.vcxproj.user
View file
Open in desktop

This file was deleted.

8 changes: 8 additions & 0 deletions example-curvesAndColors/icon.rc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
// Icon Resource Definition
#define MAIN_ICON 102

#if defined(_DEBUG)
MAIN_ICON ICON "icon_debug.ico"
#else
MAIN_ICON ICON "icon.ico"
#endif
15 changes: 6 additions & 9 deletions example-curvesAndColors/src/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,16 @@
* Shows how to use ofxTimeline to create a simple curves and color change
*/

#include "ofMain.h"
#include "testApp.h"
#include "ofAppGlutWindow.h"
#include "ofApp.h"

//========================================================================
int main( ){

ofAppGlutWindow window;
ofSetupOpenGL(&window, 1024,768, OF_WINDOW); // <-------- setup the GL context
ofGLWindowSettings settings;
settings.width = 1024;
settings.height = 768;
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 testApp());
ofRunApp(new ofApp());

}
26 changes: 13 additions & 13 deletions example-curvesAndColors/src/testApp.cpp → example-curvesAndColors/src/ofApp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@
* OTHER DEALINGS IN THE SOFTWARE.
*/

#include "testApp.h"
#include "ofApp.h"

//--------------------------------------------------------------
void testApp::setup(){
void ofApp::setup(){

ofSetFrameRate(60);
ofSetVerticalSync(true);
Expand Down Expand Up @@ -69,12 +69,12 @@ void testApp::setup(){
}

//--------------------------------------------------------------
void testApp::update(){
void ofApp::update(){

}

//--------------------------------------------------------------
void testApp::draw(){
void ofApp::draw(){

ofBackground(.15*255);
ofPushMatrix();
Expand All @@ -100,47 +100,47 @@ void testApp::draw(){
}

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

}

//--------------------------------------------------------------
void testApp::keyReleased(int key){
void ofApp::keyReleased(int key){

}

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

}

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

}

//--------------------------------------------------------------
void testApp::mousePressed(int x, int y, int button){
void ofApp::mousePressed(int x, int y, int button){

}

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

}

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

}

//--------------------------------------------------------------
void testApp::gotMessage(ofMessage msg){
void ofApp::gotMessage(ofMessage msg){

}

//--------------------------------------------------------------
void testApp::dragEvent(ofDragInfo dragInfo){
void ofApp::dragEvent(ofDragInfo dragInfo){

}

2 changes: 1 addition & 1 deletion example-curvesAndColors/src/testApp.h → example-curvesAndColors/src/ofApp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
#include "ofMain.h"
#include "ofxTimeline.h"

class testApp : public ofBaseApp{
class ofApp : public ofBaseApp{

public:
void setup();
Expand Down
4 changes: 4 additions & 0 deletions ofxTimelineLib/ofxTimeline.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
<PostBuildEvent />
<PostBuildEvent>
<Command>robocopy "$(OF_ROOT)/addons/ofxTimeline/copy_to_data_GUI/" "$(ProjectDir)bin/data/GUI" /njs /njh /np /fp /bytes
</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemGroup />
</Project>
2 changes: 1 addition & 1 deletion src/ofxTLAudioTrack.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ void ofxTLAudioTrack::draw(){
for(int i = 0; i < bins.size(); i++){
float height = MIN(bounds.height * bins[i], bounds.height);
float y = bounds.y + bounds.height - height;
ofRect(i*binWidth, y, binWidth, height);
ofDrawRectangle(i*binWidth, y, binWidth, height);
}

ofPopStyle();
Expand Down
4 changes: 2 additions & 2 deletions src/ofxTLBangs.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ void ofxTLBangs::draw(){
if(currentPercent > 0){
ofSetColor(timeline->getColors().disabledColor, 100*(currentPercent));
ofFill();
ofRect(bounds.x, bounds.y, bounds.width, bounds.height);
ofDrawRectangle(bounds);
}

for(int i = keyframes.size()-1; i >= 0; i--){
Expand All @@ -78,7 +78,7 @@ void ofxTLBangs::draw(){
ofSetColor(timeline->getColors().keyColor);
}

ofLine(screenX, bounds.y, screenX, bounds.y+bounds.height);
ofDrawLine(screenX, bounds.y, screenX, bounds.y+bounds.height);
}
ofPopStyle();

Expand Down
52 changes: 26 additions & 26 deletions src/ofxTLCameraTrack.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ void ofxTLCameraTrack::draw(){
if(lockCameraToTrack){
ofSetColor(timeline->getColors().keyColor, 40*(sin(ofGetElapsedTimef()*5)*.5+.5)+25);
ofFill();
ofRect(bounds);
ofDrawRectangle(bounds);
}
ofSetColor(timeline->getColors().keyColor);
ofNoFill();
Expand Down Expand Up @@ -131,7 +131,7 @@ void ofxTLCameraTrack::draw(){
for(int i = 0; i < selectedKeyframes.size(); i++){
float screenX = millisToScreenX( selectedKeyframes[i]->time );
float screenY = bounds.y+bounds.height/2;
ofCircle(screenX, screenY, 4);
ofDrawCircle(screenX, screenY, 4);
}

ofPopStyle();
Expand Down Expand Up @@ -164,11 +164,11 @@ void ofxTLCameraTrack::draw3d(){
n.setPosition(interFrame.position);
n.setOrientation(interFrame.orientation);
ofSetColor(0,0,255);
ofLine(n.getPosition(), n.getPosition() + n.getLookAtDir()*10);
ofDrawLine(n.getPosition(), n.getPosition() + n.getLookAtDir()*10);
ofSetColor(0,255,0);
ofLine(n.getPosition(), n.getPosition() + n.getUpDir()*10);
ofDrawLine(n.getPosition(), n.getPosition() + n.getUpDir()*10);
ofSetColor(255,0,0);
ofLine(n.getPosition(), n.getPosition() + n.getSideDir()*10);
ofDrawLine(n.getPosition(), n.getPosition() + n.getSideDir()*10);
}

setCameraFrameToTime(&interFrame, currentTrackTime());
Expand All @@ -177,11 +177,11 @@ void ofxTLCameraTrack::draw3d(){

ofSetLineWidth(3);
ofSetColor(0,0,255);
ofLine(n.getPosition(), n.getPosition() + n.getLookAtDir()*25);
ofDrawLine(n.getPosition(), n.getPosition() + n.getLookAtDir()*25);
ofSetColor(0,255,0);
ofLine(n.getPosition(), n.getPosition() + n.getUpDir()*25);
ofDrawLine(n.getPosition(), n.getPosition() + n.getUpDir()*25);
ofSetColor(255,0,0);
ofLine(n.getPosition(), n.getPosition() + n.getSideDir()*25);
ofDrawLine(n.getPosition(), n.getPosition() + n.getSideDir()*25);

ofNoFill();
ofSetColor(255);
Expand All @@ -194,14 +194,14 @@ void ofxTLCameraTrack::draweEase(CameraTrackEase ease, ofPoint screenPoint, bool
switch (ease) {
case OFXTL_CAMERA_EASE_LINEAR:
if(easeIn){
ofTriangle(screenPoint.x-bounds.height, screenPoint.y,
screenPoint.x, screenPoint.y,
screenPoint.x, screenPoint.y+bounds.height);
ofDrawTriangle(screenPoint.x-bounds.height, screenPoint.y,
screenPoint.x, screenPoint.y,
screenPoint.x, screenPoint.y+bounds.height);
}
else{
ofTriangle(screenPoint.x, screenPoint.y,
screenPoint.x, screenPoint.y+bounds.height,
screenPoint.x+bounds.height, screenPoint.y+bounds.height);
ofDrawTriangle(screenPoint.x, screenPoint.y,
screenPoint.x, screenPoint.y+bounds.height,
screenPoint.x+bounds.height, screenPoint.y+bounds.height);
}
break;
case OFXTL_CAMERA_EASE_SMOOTH:
Expand All @@ -210,30 +210,30 @@ void ofxTLCameraTrack::draweEase(CameraTrackEase ease, ofPoint screenPoint, bool
screenPoint.x-bounds.height/2, screenPoint.y,
screenPoint.x, screenPoint.y+bounds.height/2,
screenPoint.x, screenPoint.y+bounds.height);
ofLine(screenPoint.x-bounds.height, screenPoint.y,
screenPoint.x, screenPoint.y);
ofLine(screenPoint.x, screenPoint.y,
screenPoint.x, screenPoint.y+bounds.height);
ofDrawLine(screenPoint.x-bounds.height, screenPoint.y,
screenPoint.x, screenPoint.y);
ofDrawLine(screenPoint.x, screenPoint.y,
screenPoint.x, screenPoint.y+bounds.height);
}
else {
ofBezier(screenPoint.x, screenPoint.y,
screenPoint.x, screenPoint.y+bounds.height/2,
screenPoint.x+bounds.height/2, screenPoint.y+bounds.height,
screenPoint.x+bounds.height, screenPoint.y+bounds.height);
ofLine(screenPoint.x, screenPoint.y,
screenPoint.x, screenPoint.y+bounds.height);
ofLine(screenPoint.x, screenPoint.y+bounds.height,
screenPoint.x+bounds.height, screenPoint.y+bounds.height);
ofDrawLine(screenPoint.x, screenPoint.y,
screenPoint.x, screenPoint.y+bounds.height);
ofDrawLine(screenPoint.x, screenPoint.y+bounds.height,
screenPoint.x+bounds.height, screenPoint.y+bounds.height);
}
break;
case OFXTL_CAMERA_EASE_CUT:
if(easeIn){
ofRect(screenPoint.x-bounds.height/2, screenPoint.y,
bounds.height/2, bounds.height/2);
ofDrawRectangle(screenPoint.x-bounds.height/2, screenPoint.y,
bounds.height/2, bounds.height/2);
}
else{
ofRect(screenPoint.x, screenPoint.y+bounds.height/2,
bounds.height/2, bounds.height/2);
ofDrawRectangle(screenPoint.x, screenPoint.y+bounds.height/2,
bounds.height/2, bounds.height/2);
}
break;
default:
Expand Down
Loading