Skip to content

Commit 69aebd5

Browse files
danoli3danoli3
committed
Restore current files for unneeded changes
1 parent aa65820 commit 69aebd5

11 files changed

Lines changed: 32 additions & 310 deletions

File tree

‎libs/openFrameworks/3d/ofMesh.h‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -196,10 +196,8 @@ class ofMesh_{
196196
void removeVertex(ofIndexType index);
197197

198198
/// \brief Removes the vertices at the startIndex in the vector and the endindex specified
199-
200199
void removeVertices(ofIndexType startIndex, ofIndexType endIndex);
201200

202-
203201
void setVertex(ofIndexType index, const V& v);
204202

205203
/// \brief Removes all the vertices.
@@ -279,7 +277,6 @@ class ofMesh_{
279277
/// \brief Remove normal's from index to end index from normals vector
280278
void removeNormals(ofIndexType startIndex, ofIndexType endIndex);
281279

282-
283280
/// \todo Documentation.
284281
void setNormal(ofIndexType index, const N& n);
285282

@@ -436,7 +433,7 @@ class ofMesh_{
436433
void removeTexCoord(ofIndexType index);
437434

438435
void removeTexCoords(ofIndexType startIndex, ofIndexType endIndex);
439-
436+
440437
void setTexCoord(ofIndexType index, const T& t);
441438

442439
/// \brief Clear all the texture coordinates.

‎libs/openFrameworks/app/ofBaseApp.cpp‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ ofBaseApp::ofBaseApp() {
55
mouseX = mouseY = 0;
66
}
77

8+
ofBaseApp::~ofBaseApp(){
9+
}
10+
811
void ofBaseApp::setup(){}
912
void ofBaseApp::update(){}
1013
void ofBaseApp::draw(){}
@@ -117,11 +120,4 @@ void ofBaseApp::touchDoubleTap(ofTouchEventArgs & touch) {
117120
};
118121
void ofBaseApp::touchCancelled(ofTouchEventArgs & touch){
119122
touchCancelled(touch.x, touch.y, touch.id);
120-
};
121-
void ofBaseApp::audioOut(ofSoundBuffer &buffer) {
122-
123-
};
124-
125-
void ofBaseApp::audioIn(ofSoundBuffer &buffer) {
126-
127-
};
123+
}

‎libs/openFrameworks/app/ofBaseApp.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@ class ofBaseApp : public ofBaseSoundInput, public ofBaseSoundOutput{
1515

1616
public:
1717
ofBaseApp();
18+
19+
virtual ~ofBaseApp();
20+
1821
virtual void setup();
1922
virtual void update();
2023
virtual void draw();
@@ -91,9 +94,6 @@ class ofBaseApp : public ofBaseSoundInput, public ofBaseSoundOutput{
9194
virtual void touchUp(ofTouchEventArgs & touch);
9295
virtual void touchDoubleTap(ofTouchEventArgs & touch);
9396
virtual void touchCancelled(ofTouchEventArgs & touch);
94-
95-
virtual void audioOut( ofSoundBuffer& buffer );
96-
virtual void audioIn( ofSoundBuffer& buffer );
9797
};
9898

9999

‎libs/openFrameworks/gl/ofBufferObject.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ void ofBufferObject::setData(GLsizeiptr bytes, const void * data, GLenum usage){
133133
}
134134

135135
void ofBufferObject::updateData(GLintptr offset, GLsizeiptr bytes, const void * data){
136-
if(!this->data || this->data == nullptr) return;
136+
if(!this->data) return;
137137

138138
#ifdef GLEW_VERSION_4_5
139139
if(this->data->isDSA){

‎libs/openFrameworks/graphics/ofGraphicsBaseTypes.cpp‎

Lines changed: 0 additions & 184 deletions
Original file line numberDiff line numberDiff line change
@@ -37,187 +37,3 @@ void ofBaseRenderer::rotateZDeg(float degrees){
3737
void ofBaseRenderer::rotateDeg(float degrees){
3838
rotateRad(glm::radians(degrees));
3939
}
40-
41-
void ofBaseRenderer::draw(const ofMesh &mesh, ofPolyRenderMode renderType) const {
42-
// Not Implemented
43-
}
44-
45-
void ofBaseRenderer::setPlaneResolution(int columns, int rows) {
46-
// Not Implemented
47-
}
48-
49-
glm::vec2 ofBaseRenderer::getPlaneResolution() const {
50-
return glm::vec2();
51-
}
52-
53-
void ofBaseRenderer::drawPlane(float x, float y, float width, float height) const {
54-
55-
}
56-
57-
void ofBaseRenderer::drawPlane(float x, float y, float z, float width, float height) const {
58-
59-
}
60-
61-
void ofBaseRenderer::drawPlane(const glm::vec3 &position, float width, float height) const {
62-
63-
}
64-
65-
void ofBaseRenderer::drawPlane(float width, float height) const {
66-
67-
}
68-
69-
void ofBaseRenderer::setSphereResolution(int res) {
70-
71-
}
72-
73-
int ofBaseRenderer::getSphereResolution() const {
74-
return 0;
75-
}
76-
77-
void ofBaseRenderer::drawSphere(float x, float y, float radius) const {
78-
79-
}
80-
81-
void ofBaseRenderer::drawSphere(float x, float y, float z, float radius) const {
82-
83-
}
84-
85-
void ofBaseRenderer::drawSphere(const glm::vec3 &position, float radius) const {
86-
87-
}
88-
89-
void ofBaseRenderer::drawSphere(float radius) const {
90-
91-
}
92-
93-
void ofBaseRenderer::setIcoSphereResolution(int res) {
94-
95-
}
96-
97-
int ofBaseRenderer::getIcoSphereResolution() const {
98-
return 0;
99-
}
100-
101-
void ofBaseRenderer::drawIcoSphere(float x, float y, float z, float radius) const {
102-
103-
}
104-
105-
void ofBaseRenderer::drawIcoSphere(float x, float y, float radius) const {
106-
107-
}
108-
109-
void ofBaseRenderer::drawIcoSphere(const glm::vec3 &position, float radius) const {
110-
111-
}
112-
113-
void ofBaseRenderer::drawIcoSphere(float radius) const {
114-
115-
}
116-
117-
void
118-
ofBaseRenderer::setCylinderResolution(int radiusSegments, int heightSegments, int capSegments) {
119-
120-
}
121-
122-
glm::vec3 ofBaseRenderer::getCylinderResolution() const {
123-
return glm::vec3();
124-
}
125-
126-
void ofBaseRenderer::drawCylinder(float x, float y, float radius, float height) const {
127-
128-
}
129-
130-
void ofBaseRenderer::drawCylinder(float x, float y, float z, float radius, float height) const {
131-
132-
}
133-
134-
void ofBaseRenderer::drawCylinder(float radius, float height) const {
135-
136-
}
137-
138-
void ofBaseRenderer::drawCylinder(const glm::vec3 &position, float radius, float height) const {
139-
140-
}
141-
142-
void ofBaseRenderer::setConeResolution(int radiusSegments, int heightSegments, int capSegments) {
143-
144-
}
145-
146-
glm::vec3 ofBaseRenderer::getConeResolution() const {
147-
return glm::vec3();
148-
}
149-
150-
void ofBaseRenderer::drawCone(float x, float y, float z, float radius, float height) const {
151-
152-
}
153-
154-
void ofBaseRenderer::drawCone(float x, float y, float radius, float height) const {
155-
156-
}
157-
158-
void ofBaseRenderer::drawCone(const glm::vec3 &position, float radius, float height) const {
159-
160-
}
161-
162-
void ofBaseRenderer::drawCone(float radius, float height) const {
163-
164-
}
165-
166-
void ofBaseRenderer::setBoxResolution(int res) {
167-
168-
}
169-
170-
void ofBaseRenderer::setBoxResolution(int resWidth, int resHeight, int resDepth) {
171-
172-
}
173-
174-
glm::vec3 ofBaseRenderer::getBoxResolution() const {
175-
return glm::vec3();
176-
}
177-
178-
void
179-
ofBaseRenderer::drawBox(float x, float y, float z, float width, float height, float depth) const {
180-
181-
}
182-
183-
void ofBaseRenderer::drawBox(float x, float y, float z, float size) const {
184-
185-
}
186-
187-
void
188-
ofBaseRenderer::drawBox(const glm::vec3 &position, float width, float height, float depth) const {
189-
190-
}
191-
192-
void ofBaseRenderer::drawBox(const glm::vec3 &position, float size) const {
193-
194-
}
195-
196-
void ofBaseRenderer::drawBox(float size) const {
197-
198-
}
199-
200-
void ofBaseRenderer::drawBox(float width, float height, float depth) const {
201-
202-
}
203-
204-
void ofBaseRenderer::drawAxis(float size) const {
205-
206-
}
207-
208-
void ofBaseRenderer::drawGrid(float stepSize, size_t numberOfSteps, bool labels, bool x, bool y,
209-
bool z) const {
210-
211-
}
212-
213-
void ofBaseRenderer::drawGridPlane(float stepSize, size_t numberOfSteps, bool labels) const {
214-
215-
}
216-
217-
void ofBaseRenderer::drawArrow(const glm::vec3 &start, const glm::vec3 &end, float headSize) const {
218-
219-
}
220-
221-
void ofBaseRenderer::drawRotationAxes(float radius, float stripWidth, int circleRes) const {
222-
223-
}

‎libs/openFrameworks/sound/ofAVEngineSoundPlayer.mm‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,7 @@ - (void)inputIsAvailableChanged:(BOOL)isInputAvailable;
9393
@end
9494

9595

96-
@interface AVEnginePlayer () {
97-
BOOL resetAudioEngine;
98-
}
96+
@interface AVEnginePlayer ()
9997

10098
//@property(nonatomic, strong) AVAudioEngine *engine;
10199
@property(nonatomic, strong) AVAudioMixerNode *mainMixer;
@@ -125,10 +123,7 @@ @implementation AVEnginePlayer
125123
@synthesize timer;
126124

127125
- (AVAudioEngine *) engine {
128-
129-
#if TARGET_OS_SIMULATOR
130-
return nullptr; // doesnt work
131-
#endif
126+
132127
if( _engine == nullptr ){
133128
@autoreleasepool {
134129
_engine = [[AVAudioEngine alloc] init];
@@ -1261,4 +1256,3 @@ - (float)soundDurationSeconds{
12611256
}
12621257

12631258
#endif
1264-

‎libs/openFrameworks/sound/ofSoundStream.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ std::vector<ofSoundDevice> ofSoundStreamListDevices();
8080
class ofSoundStream {
8181
public:
8282
ofSoundStream();
83-
~ofSoundStream();
83+
8484
void setSoundStream(std::shared_ptr<ofBaseSoundStream> soundStreamPtr);
8585
std::shared_ptr<ofBaseSoundStream> getSoundStream();
8686

‎libs/openFrameworks/types/ofBaseTypes.cpp‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -355,6 +355,23 @@ void ofBaseSoundInput::audioIn( ofSoundBuffer& buffer ){
355355
audioIn(&buffer[0], buffer.getNumFrames(), buffer.getNumChannels(), buffer.getDeviceID(), buffer.getTickCount());
356356
}
357357

358+
void ofBaseSoundInput::audioIn( float * input, int bufferSize, int nChannels, int deviceID, long unsigned long tickCount ){
359+
audioIn(input, bufferSize, nChannels);
360+
}
361+
362+
void ofBaseSoundInput::audioIn( float * input, int bufferSize, int nChannels ){
363+
audioReceived(input, bufferSize, nChannels);
364+
}
365+
366+
358367
void ofBaseSoundOutput::audioOut( ofSoundBuffer& buffer ){
359368
audioOut(&buffer[0], buffer.getNumFrames(), buffer.getNumChannels(), buffer.getDeviceID(), buffer.getTickCount());
360369
}
370+
371+
void ofBaseSoundOutput::audioOut( float * output, int bufferSize, int nChannels, int deviceID, long unsigned long tickCount ){
372+
audioOut(output, bufferSize, nChannels);
373+
}
374+
375+
void ofBaseSoundOutput::audioOut( float * output, int bufferSize, int nChannels ){
376+
audioRequested(output, bufferSize, nChannels);
377+
}

‎libs/openFrameworks/utils/ofFileUtils.cpp‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,7 @@
77
#include <sys/stat.h>
88
#include <unistd.h>
99
#endif
10-
#ifdef EMSCRIPTEN
11-
uid_t geteuid() {
12-
return 0;
13-
}
14-
gid_t getegid() {
15-
return 0;
16-
}
17-
#endif
10+
1811
#ifdef TARGET_OSX
1912
#include <mach-o/dyld.h> /* _NSGetExecutablePath */
2013
#include <limits.h> /* PATH_MAX */

‎libs/openFrameworks/utils/ofMatrixStack.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ ofMatrixStack::ofMatrixStack(const ofAppBaseWindow * window)
2626
,currentRenderSurface(nullptr)
2727
,currentWindow(const_cast<ofAppBaseWindow*>(window))
2828
,currentMatrixMode(OF_MATRIX_MODELVIEW)
29+
,currentMatrix(&modelViewMatrix)
30+
,flipRenderSurfaceMatrix(true)
2931
,modelMatrix(1)
3032
,viewMatrix(1)
3133
,viewInverse(1)
@@ -36,8 +38,6 @@ ofMatrixStack::ofMatrixStack(const ofAppBaseWindow * window)
3638
,orientedProjectionMatrix(1)
3739
,orientationMatrix(1)
3840
,orientationMatrixInverse(1)
39-
,currentMatrix(&modelViewMatrix)
40-
,flipRenderSurfaceMatrix(true)
4141
{
4242

4343
}

0 commit comments

Comments
 (0)