Skip to content

Commit 61ec73d

Browse files
d3cod3d3cod3
committed
updated to opengl 4.1 and removed ofxFontStash dependency
1 parent 2accfa4 commit 61ec73d

File tree

291 files changed

+352
-328
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

291 files changed

+352
-328
lines changed

‎addon_config.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ common:
2525
# dependencies with other addons, a list of them separated by spaces
2626
# or use += in several lines
2727
ADDON_DEPENDENCIES = ofxAssimpModelLoader ofxGui ofxKinect ofxNetwork ofxOpenCv ofxOsc ofxSvg ofxVectorGraphics ofxXmlSettings
28-
ADDON_DEPENDENCIES += ofxAudioAnalyzer ofxAudioFile ofxBTrack ofxChromaKeyShader ofxCv ofxEasing ofxFFmpegRecorder ofxFontStash ofxGLEditor
28+
ADDON_DEPENDENCIES += ofxAudioAnalyzer ofxAudioFile ofxBTrack ofxChromaKeyShader ofxCv ofxEasing ofxFFmpegRecorder ofxGLEditor
2929
ADDON_DEPENDENCIES += ofxJSON ofxInfiniteCanvas ofxLua ofxMidi ofxMtlMapping2D
3030
ADDON_DEPENDENCIES += ofxPDSP ofxTimeline ofxWarp
3131
ADDON_DEPENDENCIES += ofxImGui

‎src/PatchObject.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ void PatchObject::update(map<int,shared_ptr<PatchObject>> &patchObjects, pdsp::E
155155
}
156156

157157
//--------------------------------------------------------------
158-
void PatchObject::draw(ofxFontStash *font){
158+
void PatchObject::draw(ofTrueTypeFont *font){
159159

160160
if(willErase) return;
161161

‎src/PatchObject.h‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
#include "config.h"
3737
#include "utils.h"
3838

39-
#include "ofxFontStash.h"
4039
#include "ofxXmlSettings.h"
4140
#include "ofxPDSP.h"
4241

@@ -82,7 +81,7 @@ class PatchObject : public ofxVPHasUID {
8281
void setup(shared_ptr<ofAppGLFWWindow> &mainWindow);
8382
void setupDSP(pdsp::Engine &engine);
8483
void update(map<int,shared_ptr<PatchObject>> &patchObjects, pdsp::Engine &engine);
85-
void draw(ofxFontStash *font);
84+
void draw(ofTrueTypeFont *font);
8685
void drawImGuiNode(ImGuiEx::NodeCanvas& _nodeCanvas, map<int,shared_ptr<PatchObject>> &patchObjects);
8786
void drawImGuiNodeConfig();
8887

@@ -96,7 +95,7 @@ class PatchObject : public ofxVPHasUID {
9695
virtual void setupAudioOutObjectContent(pdsp::Engine &engine) {}
9796
virtual void updateObjectContent(map<int,shared_ptr<PatchObject>> &patchObjects) {}
9897
virtual void updateAudioObjectContent(pdsp::Engine &engine) {}
99-
virtual void drawObjectContent(ofxFontStash *font, shared_ptr<ofBaseGLRenderer>& glRenderer) {}
98+
virtual void drawObjectContent(ofTrueTypeFont *font, shared_ptr<ofBaseGLRenderer>& glRenderer) {}
10099
virtual void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) {}
101100
virtual void drawObjectNodeConfig() {}
102101
virtual void removeObjectContent(bool removeFileFromData=false) {}

‎src/objects/audio_analysis/AudioAnalyzer.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ void AudioAnalyzer::updateObjectContent(map<int,shared_ptr<PatchObject>> &patchO
199199
}
200200

201201
//--------------------------------------------------------------
202-
void AudioAnalyzer::drawObjectContent(ofxFontStash *font, shared_ptr<ofBaseGLRenderer>& glRenderer){
202+
void AudioAnalyzer::drawObjectContent(ofTrueTypeFont *font, shared_ptr<ofBaseGLRenderer>& glRenderer){
203203
ofSetColor(255);
204204
}
205205

‎src/objects/audio_analysis/AudioAnalyzer.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ class AudioAnalyzer : public PatchObject {
5252
void setupObjectContent(shared_ptr<ofAppGLFWWindow> &mainWindow) override;
5353
void updateObjectContent(map<int,shared_ptr<PatchObject>> &patchObjects) override;
5454

55-
void drawObjectContent(ofxFontStash *font, shared_ptr<ofBaseGLRenderer>& glRenderer) override;
55+
void drawObjectContent(ofTrueTypeFont *font, shared_ptr<ofBaseGLRenderer>& glRenderer) override;
5656
void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override;
5757
void drawObjectNodeConfig() override;
5858

‎src/objects/audio_analysis/BPMExtractor.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ void BPMExtractor::updateObjectContent(map<int,shared_ptr<PatchObject>> &patchOb
124124
}
125125

126126
//--------------------------------------------------------------
127-
void BPMExtractor::drawObjectContent(ofxFontStash *font, shared_ptr<ofBaseGLRenderer>& glRenderer){
127+
void BPMExtractor::drawObjectContent(ofTrueTypeFont *font, shared_ptr<ofBaseGLRenderer>& glRenderer){
128128
ofSetColor(255);
129129

130130
}

‎src/objects/audio_analysis/BPMExtractor.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ class BPMExtractor : public PatchObject {
4848
void setupObjectContent(shared_ptr<ofAppGLFWWindow> &mainWindow) override;
4949
void updateObjectContent(map<int,shared_ptr<PatchObject>> &patchObjects) override;
5050

51-
void drawObjectContent(ofxFontStash *font, shared_ptr<ofBaseGLRenderer>& glRenderer) override;
51+
void drawObjectContent(ofTrueTypeFont *font, shared_ptr<ofBaseGLRenderer>& glRenderer) override;
5252
void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override;
5353
void drawObjectNodeConfig() override;
5454

‎src/objects/audio_analysis/CentroidExtractor.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ void CentroidExtractor::updateObjectContent(map<int,shared_ptr<PatchObject>> &pa
112112
}
113113

114114
//--------------------------------------------------------------
115-
void CentroidExtractor::drawObjectContent(ofxFontStash *font, shared_ptr<ofBaseGLRenderer>& glRenderer){
115+
void CentroidExtractor::drawObjectContent(ofTrueTypeFont *font, shared_ptr<ofBaseGLRenderer>& glRenderer){
116116
ofSetColor(255);
117117
}
118118

‎src/objects/audio_analysis/CentroidExtractor.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ class CentroidExtractor : public PatchObject {
4848
void setupObjectContent(shared_ptr<ofAppGLFWWindow> &mainWindow) override;
4949
void updateObjectContent(map<int,shared_ptr<PatchObject>> &patchObjects) override;
5050

51-
void drawObjectContent(ofxFontStash *font, shared_ptr<ofBaseGLRenderer>& glRenderer) override;
51+
void drawObjectContent(ofTrueTypeFont *font, shared_ptr<ofBaseGLRenderer>& glRenderer) override;
5252
void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override;
5353
void drawObjectNodeConfig() override;
5454

‎src/objects/audio_analysis/DissonanceExtractor.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ void DissonanceExtractor::updateObjectContent(map<int,shared_ptr<PatchObject>> &
112112
}
113113

114114
//--------------------------------------------------------------
115-
void DissonanceExtractor::drawObjectContent(ofxFontStash *font, shared_ptr<ofBaseGLRenderer>& glRenderer){
115+
void DissonanceExtractor::drawObjectContent(ofTrueTypeFont *font, shared_ptr<ofBaseGLRenderer>& glRenderer){
116116
ofSetColor(255);
117117

118118
}

0 commit comments

Comments
 (0)