From fbe17f8bc7f775ed4c236f359efaa58adf7c3cca Mon Sep 17 00:00:00 2001 From: Dimitre Date: Sat, 2 Nov 2024 23:02:35 -0300 Subject: [PATCH 01/22] removing legacy math from core --- .../src/ofxAssimpModelLoader.cpp | 21 +- libs/openFrameworks/3d/of3dPrimitives.cpp | 6 +- libs/openFrameworks/3d/ofMesh.inl | 14 +- libs/openFrameworks/3d/ofNode.cpp | 26 ++- libs/openFrameworks/gl/ofMaterial.cpp | 40 +++- libs/openFrameworks/gl/ofShader.cpp | 97 +++++++--- libs/openFrameworks/gl/ofVbo.cpp | 48 ++--- libs/openFrameworks/gl/ofVbo.h | 20 +- libs/openFrameworks/graphics/ofGraphics.cpp | 40 ++-- libs/openFrameworks/graphics/ofPath.cpp | 2 +- libs/openFrameworks/graphics/ofPolyline.inl | 40 ++-- .../graphics/ofTrueTypeFont.cpp | 4 +- libs/openFrameworks/math/ofVectorMath.h | 165 ++++++++-------- libs/openFrameworks/ofMain.h | 4 +- libs/openFrameworks/types/ofParameter.cpp | 2 +- libs/openFrameworks/types/ofParameter.h | 40 ++-- .../openFrameworks/types/ofParameterGroup.cpp | 24 +-- .../project.pbxproj | 180 +++--------------- 18 files changed, 371 insertions(+), 402 deletions(-) diff --git a/addons/ofxAssimpModelLoader/src/ofxAssimpModelLoader.cpp b/addons/ofxAssimpModelLoader/src/ofxAssimpModelLoader.cpp index 913e344aff5..d165ad063d0 100644 --- a/addons/ofxAssimpModelLoader/src/ofxAssimpModelLoader.cpp +++ b/addons/ofxAssimpModelLoader/src/ofxAssimpModelLoader.cpp @@ -5,7 +5,7 @@ #include "ofPixels.h" #include "ofGraphics.h" #include "ofConstants.h" -#include "ofMatrix4x4.h" +//#include "ofMatrix4x4.h" #include "ofUtils.h" // ofGetElapsedTimef #include @@ -587,10 +587,17 @@ void ofxAssimpModelLoader::updateMeshes(aiNode * node, glm::mat4 parentMatrix) { aiMatrix4x4 m = node->mTransformation; m.Transpose(); - ofMatrix4x4 matrix(m.a1, m.a2, m.a3, m.a4, - m.b1, m.b2, m.b3, m.b4, - m.c1, m.c2, m.c3, m.c4, - m.d1, m.d2, m.d3, m.d4); + // FIXME: - mat4 + glm::mat4 matrix( + m.a1, m.a2, m.a3, m.a4, + m.b1, m.b2, m.b3, m.b4, + m.c1, m.c2, m.c3, m.c4, + m.d1, m.d2, m.d3, m.d4 + ); +// ofMatrix4x4 matrix(m.a1, m.a2, m.a3, m.a4, +// m.b1, m.b2, m.b3, m.b4, +// m.c1, m.c2, m.c3, m.c4, +// m.d1, m.d2, m.d3, m.d4); matrix *= parentMatrix; for(unsigned int i = 0; i < node->mNumMeshes; i++) { @@ -685,7 +692,7 @@ void ofxAssimpModelLoader::updateGLResources(){ void ofxAssimpModelLoader::updateModelMatrix() { modelMatrix = glm::identity(); - modelMatrix = glm::translate(modelMatrix, toGlm(pos)); + modelMatrix = glm::translate(modelMatrix, pos); modelMatrix = glm::rotate(modelMatrix, ofDegToRad(180), glm::vec3(0,0,1)); if(normalizeScale) { @@ -696,7 +703,7 @@ void ofxAssimpModelLoader::updateModelMatrix() { modelMatrix = glm::rotate(modelMatrix, ofDegToRad(rotAngle[i]), glm::vec3(rotAxis[i].x, rotAxis[i].y, rotAxis[i].z)); } - modelMatrix = glm::scale(modelMatrix, toGlm(scale)); + modelMatrix = glm::scale(modelMatrix, scale); } //------------------------------------------- animations. diff --git a/libs/openFrameworks/3d/of3dPrimitives.cpp b/libs/openFrameworks/3d/of3dPrimitives.cpp index 7ae27839329..21a8657a975 100644 --- a/libs/openFrameworks/3d/of3dPrimitives.cpp +++ b/libs/openFrameworks/3d/of3dPrimitives.cpp @@ -249,14 +249,16 @@ void of3dPrimitive::drawNormals(float length, bool bFaceNormals) const{ vert = (vertices[i-2]+vertices[i-1]+vertices[i]) / 3; } normalsMesh.setVertex(i*2, vert); - normal = glm::normalize(toGlm(normals[i])); +// normal = glm::normalize(toGlm(normals[i])); + normal = glm::normalize(normals[i]); normal *= length; normalsMesh.setVertex(i*2+1, vert+normal); } } else { for(size_t i = 0; i < normals.size(); i++) { vert = vertices[i]; - normal = glm::normalize(toGlm(normals[i])); +// normal = glm::normalize(toGlm(normals[i])); + normal = glm::normalize(normals[i]); normalsMesh.setVertex( i*2, vert); normal *= length; normalsMesh.setVertex(i*2+1, vert+normal); diff --git a/libs/openFrameworks/3d/ofMesh.inl b/libs/openFrameworks/3d/ofMesh.inl index f738ead0cc2..75f74bd48f0 100644 --- a/libs/openFrameworks/3d/ofMesh.inl +++ b/libs/openFrameworks/3d/ofMesh.inl @@ -2207,9 +2207,9 @@ ofMesh_ ofMesh_::icosphere(float radius, std::size_t iteration auto v3 = vertices[i3]; //make 1 vertice at the center of each edge and project it onto the sphere vertices.insert(vertices.end(), { - glm::normalize(toGlm(v1+v2)), - glm::normalize(toGlm(v2+v3)), - glm::normalize(toGlm(v1+v3)), + glm::normalize(v1+v2), + glm::normalize(v2+v3), + glm::normalize(v1+v3), }); //now recreate indices newFaces.insert(newFaces.end(), { @@ -2438,7 +2438,7 @@ ofMesh_ ofMesh_::cylinder( float radius, float height, int rad mesh.addVertex( vert ); mesh.addNormal( normal ); - normal = glm::rotate(toGlm(normal), -angleIncRadius, up); + normal = glm::rotate(normal, -angleIncRadius, up); } } @@ -2585,10 +2585,10 @@ ofMesh_ ofMesh_::cone( float radius, float height, int radiusS vert.z = std::sin((float)ix*angleIncRadius) * newRad; } - auto diff = toGlm(vert - startVec); - auto crossed = glm::cross(up, toGlm(vert)); + auto diff = vert - startVec; + auto crossed = glm::cross(up, vert); normal = glm::cross(crossed, diff); - mesh.addNormal( glm::normalize(toGlm(normal)) ); + mesh.addNormal( glm::normalize(normal) ); } } diff --git a/libs/openFrameworks/3d/ofNode.cpp b/libs/openFrameworks/3d/ofNode.cpp index 13cc516a135..fa98c1cab2e 100644 --- a/libs/openFrameworks/3d/ofNode.cpp +++ b/libs/openFrameworks/3d/ofNode.cpp @@ -1,10 +1,13 @@ +#define GLM_FORCE_CTOR_INIT +#define GLM_ENABLE_EXPERIMENTAL +#define GLM_SWIZZLE +//#define GLM_SWIZZLE_XYZW #include "ofNode.h" #include "of3dGraphics.h" -#define GLM_FORCE_CTOR_INIT -#define GLM_ENABLE_EXPERIMENTAL #include +//#include //---------------------------------------- ofNode::ofNode() @@ -135,9 +138,11 @@ void ofNode::setParent(ofNode& parent, bool bMaintainGlobalTransform) { clearParent(bMaintainGlobalTransform); } if(bMaintainGlobalTransform) { - auto postParentPosition = position - parent.getGlobalPosition(); + glm::vec3 pos { position }; + glm::vec3 scl { scale }; + auto postParentPosition = pos - parent.getGlobalPosition(); auto postParentOrientation = orientation.get() * glm::inverse(parent.getGlobalOrientation()); - auto postParentScale = scale / parent.getGlobalScale(); + auto postParentScale = scl / parent.getGlobalScale(); parent.addListener(*this); setOrientation(postParentOrientation); setPosition(postParentPosition); @@ -632,8 +637,8 @@ void ofNode::orbitDeg(float longitude, float latitude, float radius, const glm:: p = q * p; // rotate p on unit sphere based on quaternion p = p * radius; // scale p by radius from its position on unit sphere - - setGlobalPosition(centerPoint + p); + + setGlobalPosition(centerPoint + p.xyz()); setOrientation(q); onOrientationChanged(); @@ -656,7 +661,7 @@ void ofNode::orbitRad(float longitude, float latitude, float radius, const glm:: p = q * p; // rotate p on unit sphere based on quaternion p = p * radius; // scale p by radius from its position on unit sphere - setGlobalPosition(centerPoint + p); + setGlobalPosition(centerPoint + p.xyz()); setOrientation(q); onOrientationChanged(); @@ -708,9 +713,12 @@ void ofNode::restoreTransformGL(ofBaseRenderer * renderer) const { //---------------------------------------- void ofNode::createMatrix() { - localTransformMatrix = glm::translate(glm::mat4(1.0), toGlm(position)); + glm::vec3 pos = position; + glm::vec3 scl = scale; + + localTransformMatrix = glm::translate(glm::mat4(1.0), pos); localTransformMatrix = localTransformMatrix * glm::toMat4((const glm::quat&)orientation); - localTransformMatrix = glm::scale(localTransformMatrix, toGlm(scale)); + localTransformMatrix = glm::scale(localTransformMatrix, scl); updateAxis(); } diff --git a/libs/openFrameworks/gl/ofMaterial.cpp b/libs/openFrameworks/gl/ofMaterial.cpp index 83d565808a3..222cead14f3 100644 --- a/libs/openFrameworks/gl/ofMaterial.cpp +++ b/libs/openFrameworks/gl/ofMaterial.cpp @@ -1135,6 +1135,7 @@ void ofMaterial::updateLights(const ofShader & shader,ofGLProgrammableRenderer & shared_ptr light = ofLightsData()[i].lock(); if(!light || !light->isEnabled){ shader.setUniform1f("lights["+idx+"].enabled",0); +// lights[i].enabled = 0; continue; } glm::vec4 lightEyePosition = light->position; @@ -1154,20 +1155,35 @@ void ofMaterial::updateLights(const ofShader & shader,ofGLProgrammableRenderer & } if( light->lightType != OF_LIGHT_POINT ) { shader.setUniform3f("lights["+idx+"].direction", light->direction ); +// lights[i].direction = light->direction; } } +// lights[i].enabled = 1; +// lights[i].type = light->lightType; +// lights[i].position = lightEyePosition; + shader.setUniform1f("lights["+idx+"].enabled",1); shader.setUniform1f("lights["+idx+"].type", light->lightType); shader.setUniform4f("lights["+idx+"].position", lightEyePosition); if( !isPBR() ) { +// lights[i].ambient = light->ambientColor; +// lights[i].specular = light->specularColor; + shader.setUniform4f("lights["+idx+"].ambient", light->ambientColor); shader.setUniform4f("lights["+idx+"].specular", light->specularColor); } +// lights[idx].diffuse = light->diffuseColor; shader.setUniform4f("lights["+idx+"].diffuse", light->diffuseColor); if(light->lightType!=OF_LIGHT_DIRECTIONAL){ // TODO: add in light radius if pbr? + +// lights[idx].radius = 0.0f; +// lights[idx].constantAttenuation = light->attenuation_constant; +// lights[idx].linearAttenuation = light->attenuation_linear; +// lights[idx].quadraticAttenuation = light->attenuation_quadratic; + shader.setUniform1f("lights["+idx+"].radius", 0.0f); shader.setUniform1f("lights["+idx+"].constantAttenuation", light->attenuation_constant); shader.setUniform1f("lights["+idx+"].linearAttenuation", light->attenuation_linear); @@ -1182,9 +1198,16 @@ void ofMaterial::updateLights(const ofShader & shader,ofGLProgrammableRenderer & glm::vec4 direction4 = renderer.getCurrentViewMatrix() * glm::vec4(direction,1.0); direction = glm::vec3(direction4) / direction4.w; direction = direction - glm::vec3(lightEyePosition); + shader.setUniform3f("lights["+idx+"].spotDirection", glm::normalize(direction)); +// lights[idx].spotDirection = glm::normalize(direction); + } //shader.setUniform3f("lights["+idx+"].spotDirection", glm::normalize(direction)); +// lights[idx].spotExponent = light->exponent; +// lights[idx].spotCutoff = light->spotCutOff; +// lights[idx].spotCosCutoff = std::cos(glm::radians(light->spotCutOff))); + shader.setUniform1f("lights["+idx+"].spotExponent", light->exponent); shader.setUniform1f("lights["+idx+"].spotCutoff", light->spotCutOff); shader.setUniform1f("lights["+idx+"].spotCosCutoff", std::cos(glm::radians(light->spotCutOff))); @@ -1192,8 +1215,15 @@ void ofMaterial::updateLights(const ofShader & shader,ofGLProgrammableRenderer & if( !isPBR() ) { glm::vec3 halfVector(glm::normalize(glm::vec4(0.f, 0.f, 1.f, 0.f) + lightEyePosition)); shader.setUniform3f("lights["+idx+"].halfVector", halfVector); + +// lights[idx].halfVector = light->halfVector; + } }else if(light->lightType==OF_LIGHT_AREA){ + +// lights[idx].width = light->width; +// lights[idx].height = light->height; + shader.setUniform1f("lights["+idx+"].width", light->width); shader.setUniform1f("lights["+idx+"].height", light->height); glm::vec3 direction = light->direction; @@ -1202,6 +1232,9 @@ void ofMaterial::updateLights(const ofShader & shader,ofGLProgrammableRenderer & glm::vec4 direction4 = renderer.getCurrentViewMatrix() * glm::vec4(direction, 1.0); direction = glm::vec3(direction4) / direction4.w; direction = direction - glm::vec3(lightEyePosition); + +// lights[idx].spotDirection = glm::normalize(direction); + shader.setUniform3f("lights["+idx+"].spotDirection", glm::normalize(direction)); } @@ -1214,7 +1247,12 @@ void ofMaterial::updateLights(const ofShader & shader,ofGLProgrammableRenderer & right = right - glm::vec3(lightEyePosition); up = glm::cross(right, direction); } - shader.setUniform3f("lights["+idx+"].right", glm::normalize(toGlm(right))); + + // FIXME: why toGlm in one and not in another? +// lights[idx].right = glm::normalize(toGlm(right)); +// lights[idx].up = glm::normalize(up)); + + shader.setUniform3f("lights["+idx+"].right", glm::normalize(right)); shader.setUniform3f("lights["+idx+"].up", glm::normalize(up)); } } diff --git a/libs/openFrameworks/gl/ofShader.cpp b/libs/openFrameworks/gl/ofShader.cpp index b4df3358905..3a197a0099d 100644 --- a/libs/openFrameworks/gl/ofShader.cpp +++ b/libs/openFrameworks/gl/ofShader.cpp @@ -112,9 +112,9 @@ ofShader::ofShader(const ofShader & mom) , shaders(mom.shaders) , uniformsCache(mom.uniformsCache) , attributesBindingsCache(mom.attributesBindingsCache) -#ifndef TARGET_OPENGLES +//#ifndef TARGET_OPENGLES , uniformBlocksCache(mom.uniformBlocksCache) -#endif +//#endif { if (mom.bLoaded) { retainProgram(program); @@ -713,9 +713,9 @@ bool ofShader::linkProgram() { } } -#ifndef TARGET_OPENGLES +//#ifndef TARGET_OPENGLES #ifdef GLEW_ARB_uniform_buffer_object - if (GLEW_ARB_uniform_buffer_object) { + if (GLEW_ARB_uniform_buffer_object) { // Pre-cache all active uniforms blocks GLint numUniformBlocks = 0; glGetProgramiv(program, GL_ACTIVE_UNIFORM_BLOCKS, &numUniformBlocks); @@ -726,11 +726,13 @@ bool ofShader::linkProgram() { for (GLint i = 0; i < numUniformBlocks; i++) { glGetActiveUniformBlockName(program, i, uniformMaxLength, &length, uniformBlockName.data()); string name(uniformBlockName.begin(), uniformBlockName.begin() + length); +// std::cout << "WOW name " << name << std::endl; + bufferObjectsCache[name] = std::make_unique(); uniformBlocksCache[name] = glGetUniformBlockIndex(program, name.c_str()); } - } + } #endif -#endif +//#endif #ifdef TARGET_ANDROID ofAddListener(ofxAndroidEvents().unloadGL, this, &ofShader::unloadGL); @@ -766,11 +768,11 @@ void ofShader::reloadGL() { auto bindings = attributesBindingsCache; shaders.clear(); uniformsCache.clear(); - #ifndef TARGET_OPENGLES + //#ifndef TARGET_OPENGLES #ifdef GLEW_ARB_uniform_buffer_object // Core in OpenGL 3.1 uniformBlocksCache.clear(); #endif - #endif + //#endif attributesBindingsCache.clear(); for (auto & shader : source) { auto source = shader.second.source; @@ -821,11 +823,11 @@ void ofShader::unload() { shaders.clear(); uniformsCache.clear(); -#ifndef TARGET_OPENGLES +//#ifndef TARGET_OPENGLES #ifdef GLEW_ARB_uniform_buffer_object // Core in OpenGL 3.1 uniformBlocksCache.clear(); #endif -#endif +//#endif attributesBindingsCache.clear(); #ifdef TARGET_ANDROID ofRemoveListener(ofxAndroidEvents().reloadGL, this, &ofShader::reloadGL); @@ -1018,6 +1020,23 @@ void ofShader::setUniform4i(const string & name, int v1, int v2, int v3, int v4) } } +//-------------------------------------------------------------- +void ofShader::setUniformBufferObject(const std::string & name, const void * data, GLsizeiptr dataSize) const { + if (bufferObjectsCache.find(name) != bufferObjectsCache.end()) { + if (!bufferObjectsCache.at(name)->isAllocated()) { + bufferObjectsCache.at(name)->allocate(dataSize, GL_STATIC_DRAW); + } + bufferObjectsCache.at(name)->updateData(dataSize, data); + bufferObjectsCache.at(name)->bindBase(GL_UNIFORM_BUFFER, getUniformBlockIndex(name)); + } else { +// bufferObjectsCache.at(name) = std::make_unique(); +// for (const auto & b : bufferObjectsCache) { +// std::cout << b.first << std::endl; +// } +// std::cout << "setUniformBufferObject don't exist " << name << std::endl; + } +} + //-------------------------------------------------------------- void ofShader::setUniform1f(const string & name, float v1) const { if (bLoaded) { @@ -1151,9 +1170,11 @@ void ofShader::setUniforms(const ofParameterGroup & parameters) const { setUniform2f(parameters[i].getEscapedName(), parameters[i].cast()); } else if (parameters[i].type() == typeid(ofParameter).name()) { setUniform3f(parameters[i].getEscapedName(), parameters[i].cast()); - } else if (parameters[i].type() == typeid(ofParameter).name()) { - setUniform4f(parameters[i].getEscapedName(), parameters[i].cast()); - } else if (parameters[i].type() == typeid(ofParameterGroup).name()) { + } +// else if (parameters[i].type() == typeid(ofParameter).name()) { +// setUniform4f(parameters[i].getEscapedName(), parameters[i].cast()); +// } + else if (parameters[i].type() == typeid(ofParameterGroup).name()) { setUniforms((ofParameterGroup &)parameters[i]); } } @@ -1311,45 +1332,52 @@ GLint ofShader::getUniformLocation(const string & name) const { } } -#ifndef TARGET_OPENGLES - #ifdef GLEW_ARB_uniform_buffer_object +//#ifndef TARGET_OPENGLES +// #ifdef GLEW_ARB_uniform_buffer_object //-------------------------------------------------------------- GLint ofShader::getUniformBlockIndex(const string & name) const { if (!bLoaded) return -1; - if (GLEW_ARB_uniform_buffer_object) { +// if (GLEW_ARB_uniform_buffer_object) { +#ifdef GLEW_ARB_uniform_buffer_object auto it = uniformBlocksCache.find(name); if (it == uniformBlocksCache.end()) { return -1; } else { return it->second; } - } else { +#else + // } else { ofLogError("ofShader::getUniformBlockIndex") << "Sorry, it looks like you can't run 'ARB_uniform_buffer_object'"; return -1; - } +// } +#endif } //-------------------------------------------------------------- GLint ofShader::getUniformBlockBinding(const string & name) const { if (!bLoaded) return -1; - if (GLEW_ARB_uniform_buffer_object) { +#ifdef GLEW_ARB_uniform_buffer_object +// if (GLEW_ARB_uniform_buffer_object) { GLint index = getUniformBlockIndex(name); if (index == -1) return -1; GLint blockBinding; glGetActiveUniformBlockiv(program, index, GL_UNIFORM_BLOCK_BINDING, &blockBinding); return blockBinding; - } else { +#else +//} else { ofLogError("ofShader::getUniformBlockBinding") << "Sorry, it looks like you can't run 'ARB_uniform_buffer_object'"; return -1; - } +// } +#endif } //-------------------------------------------------------------- void ofShader::printActiveUniformBlocks() const { - if (GLEW_ARB_uniform_buffer_object) { +#ifdef GLEW_ARB_uniform_buffer_object +// if (GLEW_ARB_uniform_buffer_object) { GLint numUniformBlocks = 0; glGetProgramiv(program, GL_ACTIVE_UNIFORM_BLOCKS, &numUniformBlocks); ofLogNotice("ofShader") << numUniformBlocks << " uniform blocks"; @@ -1376,25 +1404,32 @@ void ofShader::printActiveUniformBlocks() const { line.str(""); } delete[] uniformBlockName; - } else { +#else +//} else { ofLogError("ofShader::printActiveUniformBlocks") << "Sorry, it looks like you can't run 'ARB_uniform_buffer_object'"; - } +#endif +//} } void ofShader::bindUniformBlock(GLuint binding, const string & name) const { - if (bLoaded) { - if (GLEW_ARB_uniform_buffer_object) { + if (!bLoaded) return; + + +#ifdef GLEW_ARB_uniform_buffer_object +// if (GLEW_ARB_uniform_buffer_object) { GLint index = getUniformBlockIndex(name); if (index != -1) { glUniformBlockBinding(program, index, binding); } - } else { +#else +// } else { ofLogError("ofShader::bindUniformBlock") << "Sorry, it looks like you can't run 'ARB_uniform_buffer_object'"; - } - } -} - #endif +// } #endif + +} +// #endif +//#endif //-------------------------------------------------------------- void ofShader::printActiveUniforms() const { diff --git a/libs/openFrameworks/gl/ofVbo.cpp b/libs/openFrameworks/gl/ofVbo.cpp index 4770b505d26..198b1dcdda1 100644 --- a/libs/openFrameworks/gl/ofVbo.cpp +++ b/libs/openFrameworks/gl/ofVbo.cpp @@ -327,9 +327,9 @@ void ofVbo::setVertexData(const glm::vec3 * verts, int total, int usage) { } //-------------------------------------------------------------- -void ofVbo::setVertexData(const ofVec3f * verts, int total, int usage) { - setVertexData(&verts[0].x,3,total,usage,sizeof(glm::vec3)); -} +//void ofVbo::setVertexData(const ofVec3f * verts, int total, int usage) { +// setVertexData(&verts[0].x,3,total,usage,sizeof(glm::vec3)); +//} //-------------------------------------------------------------- void ofVbo::setVertexData(const glm::vec2 * verts, int total, int usage) { @@ -337,9 +337,9 @@ void ofVbo::setVertexData(const glm::vec2 * verts, int total, int usage) { } //-------------------------------------------------------------- -void ofVbo::setVertexData(const ofVec2f * verts, int total, int usage) { - setVertexData(&verts[0].x,2,total,usage,sizeof(glm::vec2)); -} +//void ofVbo::setVertexData(const ofVec2f * verts, int total, int usage) { +// setVertexData(&verts[0].x,2,total,usage,sizeof(glm::vec2)); +//} //-------------------------------------------------------------- void ofVbo::setVertexData(const float * vert0x, int numCoords, int total, int usage, int stride) { @@ -365,9 +365,9 @@ void ofVbo::setNormalData(const glm::vec3 * normals, int total, int usage) { } //-------------------------------------------------------------- -void ofVbo::setNormalData(const ofVec3f * normals, int total, int usage) { - setNormalData(&normals[0].x,total,usage,sizeof(glm::vec3)); -} +//void ofVbo::setNormalData(const ofVec3f * normals, int total, int usage) { +// setNormalData(&normals[0].x,total,usage,sizeof(glm::vec3)); +//} //-------------------------------------------------------------- void ofVbo::setNormalData(const float * normal0x, int total, int usage, int stride) { @@ -381,9 +381,9 @@ void ofVbo::setTexCoordData(const glm::vec2 * texCoords, int total, int usage) { } //-------------------------------------------------------------- -void ofVbo::setTexCoordData(const ofVec2f * texCoords, int total, int usage) { - setTexCoordData(&texCoords[0].x,total, usage, sizeof(glm::vec2)); -} +//void ofVbo::setTexCoordData(const ofVec2f * texCoords, int total, int usage) { +// setTexCoordData(&texCoords[0].x,total, usage, sizeof(glm::vec2)); +//} //-------------------------------------------------------------- void ofVbo::setTexCoordData(const float * texCoord0x, int total, int usage, int stride) { @@ -472,9 +472,9 @@ void ofVbo::updateVertexData(const glm::vec3 * verts, int total) { } //-------------------------------------------------------------- -void ofVbo::updateVertexData(const ofVec3f * verts, int total) { - updateVertexData(&verts[0].x,total); -} +//void ofVbo::updateVertexData(const ofVec3f * verts, int total) { +// updateVertexData(&verts[0].x,total); +//} //-------------------------------------------------------------- void ofVbo::updateVertexData(const glm::vec2 * verts, int total) { @@ -482,9 +482,9 @@ void ofVbo::updateVertexData(const glm::vec2 * verts, int total) { } //-------------------------------------------------------------- -void ofVbo::updateVertexData(const ofVec2f * verts, int total) { - updateVertexData(&verts[0].x,total); -} +//void ofVbo::updateVertexData(const ofVec2f * verts, int total) { +// updateVertexData(&verts[0].x,total); +//} //-------------------------------------------------------------- void ofVbo::updateVertexData(const float * vert0x, int total) { @@ -507,9 +507,9 @@ void ofVbo::updateNormalData(const glm::vec3 * normals, int total) { } //-------------------------------------------------------------- -void ofVbo::updateNormalData(const ofVec3f * normals, int total) { - updateNormalData(&normals[0].x,total); -} +//void ofVbo::updateNormalData(const ofVec3f * normals, int total) { +// updateNormalData(&normals[0].x,total); +//} //-------------------------------------------------------------- void ofVbo::updateNormalData(const float * normal0x, int total) { @@ -522,9 +522,9 @@ void ofVbo::updateTexCoordData(const glm::vec2 * texCoords, int total) { } //-------------------------------------------------------------- -void ofVbo::updateTexCoordData(const ofVec2f * texCoords, int total) { - updateTexCoordData(&texCoords[0].x,total); -} +//void ofVbo::updateTexCoordData(const ofVec2f * texCoords, int total) { +// updateTexCoordData(&texCoords[0].x,total); +//} //-------------------------------------------------------------- void ofVbo::updateTexCoordData(const float * texCoord0x, int total) { diff --git a/libs/openFrameworks/gl/ofVbo.h b/libs/openFrameworks/gl/ofVbo.h index 1f76fe27168..9056a4c1d14 100644 --- a/libs/openFrameworks/gl/ofVbo.h +++ b/libs/openFrameworks/gl/ofVbo.h @@ -12,8 +12,8 @@ template class ofColor_; typedef ofColor_ ofFloatColor; -class ofVec2f; -class ofVec3f; +//class ofVec2f; +//class ofVec3f; template class ofMesh_; @@ -32,14 +32,14 @@ class ofVbo { void setVertexData(const glm::vec3 * verts, int total, int usage); void setVertexData(const glm::vec2 * verts, int total, int usage); - void setVertexData(const ofVec3f * verts, int total, int usage); - void setVertexData(const ofVec2f * verts, int total, int usage); +// void setVertexData(const ofVec3f * verts, int total, int usage); +// void setVertexData(const ofVec2f * verts, int total, int usage); void setColorData(const ofFloatColor * colors, int total, int usage); void setNormalData(const glm::vec3 * normals, int total, int usage); - void setNormalData(const ofVec3f * normals, int total, int usage); +// void setNormalData(const ofVec3f * normals, int total, int usage); void setTexCoordData(const glm::vec2 * texCoords, int total, int usage); - void setTexCoordData(const ofVec2f * texCoords, int total, int usage); +// void setTexCoordData(const ofVec2f * texCoords, int total, int usage); void setIndexData(const ofIndexType * indices, int total, int usage); void setVertexData(const float * vert0x, int numCoords, int total, int usage, int stride=0); @@ -85,13 +85,13 @@ class ofVbo { void updateVertexData(const glm::vec3 * verts, int total); void updateVertexData(const glm::vec2 * verts, int total); - void updateVertexData(const ofVec3f * verts, int total); - void updateVertexData(const ofVec2f * verts, int total); +// void updateVertexData(const ofVec3f * verts, int total); +// void updateVertexData(const ofVec2f * verts, int total); void updateColorData(const ofFloatColor * colors, int total); void updateNormalData(const glm::vec3 * normals, int total); - void updateNormalData(const ofVec3f * normals, int total); +// void updateNormalData(const ofVec3f * normals, int total); void updateTexCoordData(const glm::vec2 * texCoords, int total); - void updateTexCoordData(const ofVec2f * texCoords, int total); +// void updateTexCoordData(const ofVec2f * texCoords, int total); void updateIndexData(const ofIndexType * indices, int total); void updateVertexData(const float * ver0x, int total); diff --git a/libs/openFrameworks/graphics/ofGraphics.cpp b/libs/openFrameworks/graphics/ofGraphics.cpp index b7e45922cd5..bb726b89382 100644 --- a/libs/openFrameworks/graphics/ofGraphics.cpp +++ b/libs/openFrameworks/graphics/ofGraphics.cpp @@ -1121,18 +1121,18 @@ void ofVertices(const vector & polyPoints) { } //---------------------------------------------------------- -void ofVertices(const vector & polyPoints) { - for (const auto & p : polyPoints) { - ofGetCurrentRenderer()->getPath().lineTo(p); - } -} +//void ofVertices(const vector & polyPoints) { +// for (const auto & p : polyPoints) { +// ofGetCurrentRenderer()->getPath().lineTo(p); +// } +//} //---------------------------------------------------------- -void ofVertices(const vector & polyPoints) { - for (const auto & p : polyPoints) { - ofGetCurrentRenderer()->getPath().lineTo(p); - } -} +//void ofVertices(const vector & polyPoints) { +// for (const auto & p : polyPoints) { +// ofGetCurrentRenderer()->getPath().lineTo(p); +// } +//} //--------------------------------------------------- void ofCurveVertex(float x, float y) { @@ -1159,18 +1159,18 @@ void ofCurveVertices(const vector & curvePoints) { } //---------------------------------------------------------- -void ofCurveVertices(const vector & curvePoints) { - for (const auto & p : curvePoints) { - ofGetCurrentRenderer()->getPath().curveTo(p); - } -} +//void ofCurveVertices(const vector & curvePoints) { +// for (const auto & p : curvePoints) { +// ofGetCurrentRenderer()->getPath().curveTo(p); +// } +//} //---------------------------------------------------------- -void ofCurveVertices(const vector & curvePoints) { - for (const auto & p : curvePoints) { - ofGetCurrentRenderer()->getPath().curveTo(p); - } -} +//void ofCurveVertices(const vector & curvePoints) { +// for (const auto & p : curvePoints) { +// ofGetCurrentRenderer()->getPath().curveTo(p); +// } +//} //--------------------------------------------------- void ofCurveVertex(const glm::vec3 & p) { diff --git a/libs/openFrameworks/graphics/ofPath.cpp b/libs/openFrameworks/graphics/ofPath.cpp index 222bcd1e090..f327a263f4b 100644 --- a/libs/openFrameworks/graphics/ofPath.cpp +++ b/libs/openFrameworks/graphics/ofPath.cpp @@ -833,7 +833,7 @@ void ofPath::rotateDeg(float degrees, const glm::vec3& axis ){ }else{ for(int i=0;i<(int)polylines.size();i++){ for(int j=0;j<(int)polylines[i].size();j++){ - polylines[i][j] = glm::rotate(toGlm(polylines[i][j]), radians, axis); + polylines[i][j] = glm::rotate(polylines[i][j], radians, axis); } } } diff --git a/libs/openFrameworks/graphics/ofPolyline.inl b/libs/openFrameworks/graphics/ofPolyline.inl index a02ff15d6d2..31d0b1620d2 100644 --- a/libs/openFrameworks/graphics/ofPolyline.inl +++ b/libs/openFrameworks/graphics/ofPolyline.inl @@ -560,7 +560,7 @@ inline T getClosestPointUtil(const T& p1, const T& p2, const T& p3, float* norma float u = (p3.x - p1.x) * (p2.x - p1.x); u += (p3.y - p1.y) * (p2.y - p1.y); // perfect place for fast inverse sqrt... - float len = glm::length(toGlm(p2 - p1)); + float len = glm::length(p2 - p1); u /= (len * len); // clamp u @@ -572,7 +572,7 @@ inline T getClosestPointUtil(const T& p1, const T& p2, const T& p3, float* norma if(normalizedPosition != nullptr) { *normalizedPosition = u; } - return glm::mix(toGlm(p1), toGlm(p2), u); + return glm::mix(p1, p2, u); } //---------------------------------------------------------- @@ -605,7 +605,7 @@ T ofPolyline_::getClosestPoint(const T& target, unsigned int* nearestIndex) c float curNormalizedPosition = 0; auto curNearestPoint = getClosestPointUtil(cur, next, target, &curNormalizedPosition); - float curDistance = glm::distance(toGlm(curNearestPoint), toGlm(target)); + float curDistance = glm::distance(curNearestPoint, target); if(i == 0 || curDistance < distance) { distance = curDistance; nearest = i; @@ -710,7 +710,7 @@ namespace of{ float tol2 = tol * tol; // tolerance squared Segment S = {v[j], v[k]}; // segment from v[j] to v[k] auto u = S.P1 - S.P0; // segment direction vector - double cu = glm::dot(toGlm(u), toGlm(u)); // segment length squared + double cu = glm::dot(u, u); // segment length squared // test each vertex v[i] for max distance from S // compute using the Feb 2001 Algorithm's dist_ofPoint_to_Segment() @@ -722,13 +722,13 @@ namespace of{ for (int i=j+1; i::rotateDeg(float degrees, const glm::vec3& axis){ template void ofPolyline_::rotateRad(float radians, const glm::vec3& axis){ for(auto & point : points){ - point = glm::rotate(toGlm(point), radians, axis); + point = glm::rotate(point, radians, axis); } flagHasChanged(); } @@ -970,7 +970,7 @@ T ofPolyline_::getPointAtIndexInterpolated(float findex) const { getInterpolationParams(findex, i1, i2, t); T leftPoint(points[i1]); T rightPoint(points[i2]); - return glm::mix(toGlm(leftPoint), toGlm(rightPoint), t); + return glm::mix(leftPoint, rightPoint, t); } @@ -1039,7 +1039,7 @@ T ofPolyline_::getRotationAtIndexInterpolated(float findex) const { int i1, i2; float t; getInterpolationParams(findex, i1, i2, t); - return glm::mix(toGlm(getRotationAtIndex(i1)), toGlm(getRotationAtIndex(i2)), t); + return glm::mix(getRotationAtIndex(i1), getRotationAtIndex(i2), t); } //-------------------------------------------------- @@ -1057,7 +1057,7 @@ T ofPolyline_::getTangentAtIndexInterpolated(float findex) const { int i1, i2; float t; getInterpolationParams(findex, i1, i2, t); - return glm::mix(toGlm(getTangentAtIndex(i1)), toGlm(getTangentAtIndex(i2)), t); + return glm::mix(getTangentAtIndex(i1), getTangentAtIndex(i2), t); } //-------------------------------------------------- @@ -1075,7 +1075,7 @@ T ofPolyline_::getNormalAtIndexInterpolated(float findex) const { int i1, i2; float t; getInterpolationParams(findex, i1, i2, t); - return glm::mix(toGlm(getNormalAtIndex(i1)), toGlm(getNormalAtIndex(i2)), t); + return glm::mix(getNormalAtIndex(i1), getNormalAtIndex(i2), t); } @@ -1086,9 +1086,9 @@ void ofPolyline_::calcData(int index, T &tangent, float &angle, T &rotation, int i2 = getWrappedIndex( index ); int i3 = getWrappedIndex( index + 1 ); - const auto &p1 = toGlm(points[i1]); - const auto &p2 = toGlm(points[i2]); - const auto &p3 = toGlm(points[i3]); + const auto &p1 = points[i1]; + const auto &p2 = points[i2]; + const auto &p3 = points[i3]; auto v1(p1 - p2); // vector to previous point auto v2(p3 - p2); // vector to next point @@ -1103,9 +1103,9 @@ void ofPolyline_::calcData(int index, T &tangent, float &angle, T &rotation, bool noSegmentHasZeroLength = (v1 == v1 && v2 == v2); if ( noSegmentHasZeroLength ){ - tangent = toOf( glm::length2(v2 - v1) > 0 ? glm::normalize(v2 - v1) : -v1 ); - normal = toOf( glm::normalize( glm::cross( toGlm( rightVector ), toGlm( tangent ) ) ) ); - rotation = toOf( glm::cross( v1, v2 ) ); + tangent = ( glm::length2(v2 - v1) > 0 ? glm::normalize(v2 - v1) : -v1 ); + normal = ( glm::normalize( glm::cross( rightVector , tangent ) ) ); + rotation = ( glm::cross( v1, v2 ) ); angle = glm::pi() - acosf( ofClamp( glm::dot( v1, v2 ), -1.f, 1.f ) ); } else{ rotation = tangent = normal = T( 0.f ); @@ -1194,7 +1194,7 @@ void ofPolyline_::updateCache(bool bForceUpdate) const { rotations[i] = rotation; normals[i] = normal; - length += glm::distance(toGlm(points[i]), toGlm(points[getWrappedIndex(i + 1)])); + length += glm::distance(points[i], points[getWrappedIndex(i + 1)]); } if(isClosed()) lengths.push_back(length); diff --git a/libs/openFrameworks/graphics/ofTrueTypeFont.cpp b/libs/openFrameworks/graphics/ofTrueTypeFont.cpp index 943c08fae5e..81257c7727d 100644 --- a/libs/openFrameworks/graphics/ofTrueTypeFont.cpp +++ b/libs/openFrameworks/graphics/ofTrueTypeFont.cpp @@ -1262,7 +1262,7 @@ glm::vec2 ofTrueTypeFont::getFirstGlyphPosForTexture(const string & str, bool vf }else{ int width = 0; int lineWidth = 0; - iterateString(str, 0, 0, vflip, [&](uint32_t c, ofVec2f){ + iterateString(str, 0, 0, vflip, [&](uint32_t c, glm::vec2){ try{ if (c != '\n') { auto g = loadGlyph(c); @@ -1296,7 +1296,7 @@ ofTexture ofTrueTypeFont::getStringTexture(const string& str, bool vflip) const{ float height = 0; float width = 0; float lineWidth = 0; - iterateString(str, 0, 0, vflip, [&](uint32_t c, ofVec2f pos){ + iterateString(str, 0, 0, vflip, [&](uint32_t c, glm::vec2 pos){ try{ if (c != '\n') { auto g = loadGlyph(c); diff --git a/libs/openFrameworks/math/ofVectorMath.h b/libs/openFrameworks/math/ofVectorMath.h index 36a3da86232..9d10165eb87 100644 --- a/libs/openFrameworks/math/ofVectorMath.h +++ b/libs/openFrameworks/math/ofVectorMath.h @@ -1,9 +1,5 @@ #pragma once -class ofMatrix3x3; -#include "ofMatrix4x4.h" -#include "ofQuaternion.h" - #define GLM_FORCE_CTOR_INIT #define GLM_ENABLE_EXPERIMENTAL #include @@ -29,80 +25,6 @@ class ofMatrix3x3; #include -//-------------------------------------------------------------- -inline const ofVec2f & toOf(const glm::vec2 & v){ - return *reinterpret_cast(&v); -} - -//-------------------------------------------------------------- -inline const ofVec3f & toOf(const glm::vec3 & v){ - return *reinterpret_cast(&v); -} - -//-------------------------------------------------------------- -inline const ofVec4f & toOf(const glm::vec4 & v){ - return *reinterpret_cast(&v); -} - -//-------------------------------------------------------------- -inline const ofMatrix4x4 & toOf(const glm::mat4 & v){ - return *reinterpret_cast(&v); -} - -//-------------------------------------------------------------- -inline const ofMatrix3x3 & toOf(const glm::mat3 & v){ - return *reinterpret_cast(&v); -} - -//-------------------------------------------------------------- -inline const glm::vec2 & toGlm(const ofVec2f & v){ - return *reinterpret_cast(&v); -} - -//-------------------------------------------------------------- -inline const glm::vec3 & toGlm(const ofVec3f & v){ - return *reinterpret_cast(&v); -} - -//-------------------------------------------------------------- -inline const glm::vec4 & toGlm(const ofVec4f & v){ - return *reinterpret_cast(&v); -} - -//-------------------------------------------------------------- -inline const glm::mat4 & toGlm(const ofMatrix4x4 & v){ - return *reinterpret_cast(&v); -} - -//-------------------------------------------------------------- -inline const glm::mat3 & toGlm(const ofMatrix3x3 & v){ - return *reinterpret_cast(&v); -} - -//-------------------------------------------------------------- -inline const glm::vec2 & toGlm(const glm::vec2 & v){ - return v; -} - -//-------------------------------------------------------------- -inline const glm::vec3 & toGlm(const glm::vec3 & v){ - return v; -} - -//-------------------------------------------------------------- -inline const glm::vec4 & toGlm(const glm::vec4 & v){ - return v; -} - -//-------------------------------------------------------------- -inline const glm::quat toGlm(const ofQuaternion & q){ - return glm::quat(q.w(), glm::vec3(q.x(), q.y(), q.z())); -} - -//-------------------------------------------------------------- -inline const glm::quat & toGlm(const glm::quat & q){ - return q; -} namespace glm { //-------------------------------------------------------------- @@ -274,6 +196,92 @@ namespace glm { } } + + +#ifdef OF_LEGACY_MATH_WOW + +class ofMatrix3x3; +#include "ofMatrix4x4.h" +#include "ofQuaternion.h" + + +// FIXME: - +//-------------------------------------------------------------- +inline const ofVec2f & toOf(const glm::vec2 & v){ + return *reinterpret_cast(&v); +} + +//-------------------------------------------------------------- +inline const ofVec3f & toOf(const glm::vec3 & v){ + return *reinterpret_cast(&v); +} + +//-------------------------------------------------------------- +inline const ofVec4f & toOf(const glm::vec4 & v){ + return *reinterpret_cast(&v); +} + +//-------------------------------------------------------------- +inline const ofMatrix4x4 & toOf(const glm::mat4 & v){ + return *reinterpret_cast(&v); +} + +//-------------------------------------------------------------- +inline const ofMatrix3x3 & toOf(const glm::mat3 & v){ + return *reinterpret_cast(&v); +} + +//-------------------------------------------------------------- +inline const glm::vec2 & toGlm(const ofVec2f & v){ + return *reinterpret_cast(&v); +} + +//-------------------------------------------------------------- +inline const glm::vec3 & toGlm(const ofVec3f & v){ + return *reinterpret_cast(&v); +} + +//-------------------------------------------------------------- +inline const glm::vec4 & toGlm(const ofVec4f & v){ + return *reinterpret_cast(&v); +} + +//-------------------------------------------------------------- +inline const glm::mat4 & toGlm(const ofMatrix4x4 & v){ + return *reinterpret_cast(&v); +} + +//-------------------------------------------------------------- +inline const glm::mat3 & toGlm(const ofMatrix3x3 & v){ + return *reinterpret_cast(&v); +} + +//-------------------------------------------------------------- +inline const glm::vec2 & toGlm(const glm::vec2 & v){ + return v; +} + +//-------------------------------------------------------------- +inline const glm::vec3 & toGlm(const glm::vec3 & v){ + return v; +} + +//-------------------------------------------------------------- +inline const glm::vec4 & toGlm(const glm::vec4 & v){ + return v; +} + +//-------------------------------------------------------------- +inline const glm::quat toGlm(const ofQuaternion & q){ + return glm::quat(q.w(), glm::vec3(q.x(), q.y(), q.z())); +} + +//-------------------------------------------------------------- +inline const glm::quat & toGlm(const glm::quat & q){ + return q; +} + + //-------------------------------------------------------------- inline glm::vec3 operator+(const glm::vec3 & v1, const ofVec3f & v2){ return v1 + glm::vec3(v2); @@ -363,3 +371,4 @@ inline glm::vec2 & operator/=(glm::vec2 & v1, const ofVec2f & v2){ } +#endif diff --git a/libs/openFrameworks/ofMain.h b/libs/openFrameworks/ofMain.h index 602116e0589..9339f01e4df 100644 --- a/libs/openFrameworks/ofMain.h +++ b/libs/openFrameworks/ofMain.h @@ -23,14 +23,14 @@ #include "ofColor.h" #include "ofGraphicsBaseTypes.h" #include "ofParameter.h" -#include "ofPoint.h" +//#include "ofPoint.h" #include "ofRectangle.h" #include "ofTypes.h" //-------------------------- // math #include "ofMath.h" -#include "ofVectorMath.h" +//#include "ofVectorMath.h" //-------------------------- // communication diff --git a/libs/openFrameworks/types/ofParameter.cpp b/libs/openFrameworks/types/ofParameter.cpp index bcf2b7167db..ff569b17aa6 100644 --- a/libs/openFrameworks/types/ofParameter.cpp +++ b/libs/openFrameworks/types/ofParameter.cpp @@ -1,5 +1,5 @@ #include "ofParameter.h" -#include "ofPoint.h" +//#include "ofPoint.h" #include "ofUtils.h" using std::string; diff --git a/libs/openFrameworks/types/ofParameter.h b/libs/openFrameworks/types/ofParameter.h index 0869cc7b1d1..7821872f67d 100644 --- a/libs/openFrameworks/types/ofParameter.h +++ b/libs/openFrameworks/types/ofParameter.h @@ -4,7 +4,7 @@ #include "ofEvents.h" // FIXME: crossed references. ofPoint adds ofVec3f which adds ofVec2f and ofVec4f -#include "ofPoint.h" +//#include "ofPoint.h" #include "ofColor.h" #include "ofLog.h" @@ -128,7 +128,7 @@ class ofParameterGroup : public ofAbstractParameter { const ofParameter & getFloat(const std::string & name) const; const ofParameter & getChar(const std::string & name) const; const ofParameter & getString(const std::string & name) const; - const ofParameter & getPoint(const std::string & name) const; +// const ofParameter & getPoint(const std::string & name) const; const ofParameter & getVec2f(const std::string & name) const; const ofParameter & getVec3f(const std::string & name) const; const ofParameter & getVec4f(const std::string & name) const; @@ -144,7 +144,7 @@ class ofParameterGroup : public ofAbstractParameter { const ofParameter & getFloat(std::size_t pos) const; const ofParameter & getChar(std::size_t pos) const; const ofParameter & getString(std::size_t pos) const; - const ofParameter & getPoint(std::size_t pos) const; +// const ofParameter & getPoint(std::size_t pos) const; const ofParameter & getVec2f(std::size_t pos) const; const ofParameter & getVec3f(std::size_t pos) const; const ofParameter & getVec4f(std::size_t pos) const; @@ -160,7 +160,7 @@ class ofParameterGroup : public ofAbstractParameter { ofParameter & getFloat(const std::string & name); ofParameter & getChar(const std::string & name); ofParameter & getString(const std::string & name); - ofParameter & getPoint(const std::string & name); +// ofParameter & getPoint(const std::string & name); ofParameter & getVec2f(const std::string & name); ofParameter & getVec3f(const std::string & name); ofParameter & getVec4f(const std::string & name); @@ -176,7 +176,7 @@ class ofParameterGroup : public ofAbstractParameter { ofParameter & getFloat(std::size_t pos); ofParameter & getChar(std::size_t pos); ofParameter & getString(std::size_t pos); - ofParameter & getPoint(std::size_t pos); +// ofParameter & getPoint(std::size_t pos); ofParameter & getVec2f(std::size_t pos); ofParameter & getVec3f(std::size_t pos); ofParameter & getVec4f(std::size_t pos); @@ -381,11 +381,11 @@ struct TypeInfo : public of::priv::TypeInfo_::is_speci }; // Here we provide some of our own specializations: -template <> -struct TypeInfo { - static ofVec2f min() { return ofVec2f(0); } - static ofVec2f max() { return ofVec2f(1); } -}; +//template <> +//struct TypeInfo { +// static ofVec2f min() { return ofVec2f(0); } +// static ofVec2f max() { return ofVec2f(1); } +//}; template <> struct TypeInfo { @@ -393,11 +393,11 @@ struct TypeInfo { static glm::vec2 max() { return glm::vec2(1); } }; -template <> -struct TypeInfo { - static ofVec3f min() { return ofVec3f(0); } - static ofVec3f max() { return ofVec3f(1); } -}; +//template <> +//struct TypeInfo { +// static ofVec3f min() { return ofVec3f(0); } +// static ofVec3f max() { return ofVec3f(1); } +//}; template <> struct TypeInfo { @@ -405,11 +405,11 @@ struct TypeInfo { static glm::vec3 max() { return glm::vec3(1); } }; -template <> -struct TypeInfo { - static ofVec4f min() { return ofVec4f(0); } - static ofVec4f max() { return ofVec4f(1); } -}; +//template <> +//struct TypeInfo { +// static ofVec4f min() { return ofVec4f(0); } +// static ofVec4f max() { return ofVec4f(1); } +//}; template <> struct TypeInfo { diff --git a/libs/openFrameworks/types/ofParameterGroup.cpp b/libs/openFrameworks/types/ofParameterGroup.cpp index 63e60d341ff..f17f1e39a47 100644 --- a/libs/openFrameworks/types/ofParameterGroup.cpp +++ b/libs/openFrameworks/types/ofParameterGroup.cpp @@ -80,9 +80,9 @@ const ofParameter & ofParameterGroup::getString(const std::string & return get(name); } -const ofParameter & ofParameterGroup::getPoint(const std::string & name) const { - return get(name); -} +//const ofParameter & ofParameterGroup::getPoint(const std::string & name) const { +// return get(name); +//} const ofParameter & ofParameterGroup::getVec2f(const std::string & name) const { return get(name); @@ -140,9 +140,9 @@ const ofParameter & ofParameterGroup::getString(std::size_t pos) co return get(pos); } -const ofParameter & ofParameterGroup::getPoint(std::size_t pos) const { - return get(pos); -} +//const ofParameter & ofParameterGroup::getPoint(std::size_t pos) const { +// return get(pos); +//} const ofParameter & ofParameterGroup::getVec2f(std::size_t pos) const { return get(pos); @@ -208,9 +208,9 @@ ofParameter & ofParameterGroup::getString(const std::string & name) return get(name); } -ofParameter & ofParameterGroup::getPoint(const std::string & name) { - return get(name); -} +//ofParameter & ofParameterGroup::getPoint(const std::string & name) { +// return get(name); +//} ofParameter & ofParameterGroup::getVec2f(const std::string & name) { return get(name); @@ -267,9 +267,9 @@ ofParameter & ofParameterGroup::getString(std::size_t pos) { return get(pos); } -ofParameter & ofParameterGroup::getPoint(std::size_t pos) { - return get(pos); -} +//ofParameter & ofParameterGroup::getPoint(std::size_t pos) { +// return get(pos); +//} ofParameter & ofParameterGroup::getVec2f(std::size_t pos) { return get(pos); diff --git a/libs/openFrameworksCompiled/project/osx/openFrameworksLib.xcodeproj/project.pbxproj b/libs/openFrameworksCompiled/project/osx/openFrameworksLib.xcodeproj/project.pbxproj index 160499121cb..476b3613711 100644 --- a/libs/openFrameworksCompiled/project/osx/openFrameworksLib.xcodeproj/project.pbxproj +++ b/libs/openFrameworksCompiled/project/osx/openFrameworksLib.xcodeproj/project.pbxproj @@ -3,12 +3,10 @@ archiveVersion = 1; classes = { }; - objectVersion = 54; + objectVersion = 46; objects = { /* Begin PBXBuildFile section */ - 0353245D2BEFEC7B00B50A35 /* ofTimerFps.h in Headers */ = {isa = PBXBuildFile; fileRef = 0353245B2BEFEC7A00B50A35 /* ofTimerFps.h */; }; - 0353245E2BEFEC7B00B50A35 /* ofTimerFps.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0353245C2BEFEC7B00B50A35 /* ofTimerFps.cpp */; }; 19662F2E2834A44400B622ED /* ofGraphicsCairo.h in Headers */ = {isa = PBXBuildFile; fileRef = 19662F2C2834A44400B622ED /* ofGraphicsCairo.h */; }; 19662F2F2834A44400B622ED /* ofGraphicsCairo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 19662F2D2834A44400B622ED /* ofGraphicsCairo.cpp */; }; 22246D93176C9987008A8AF4 /* ofGLProgrammableRenderer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 22246D91176C9987008A8AF4 /* ofGLProgrammableRenderer.cpp */; }; @@ -61,22 +59,6 @@ 9979E8231A1CCC44007E55D1 /* ofMainLoop.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9979E8201A1CCC44007E55D1 /* ofMainLoop.cpp */; }; 9979E8241A1CCC44007E55D1 /* ofMainLoop.h in Headers */ = {isa = PBXBuildFile; fileRef = 9979E8211A1CCC44007E55D1 /* ofMainLoop.h */; }; BBA81C431FFBE4DB0064EA94 /* ofBaseApp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BBA81C421FFBE4DB0064EA94 /* ofBaseApp.cpp */; }; - BF6276A62BAD9900008864C1 /* ofBaseTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = BF6276A52BAD9900008864C1 /* ofBaseTypes.h */; }; - BFB0B3F52C50DFE8008FB5A3 /* brotli.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF7C462D2C097CCE00461163 /* brotli.xcframework */; }; - BFB0B3F62C50DFE8008FB5A3 /* curl.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF6276A32BAD6639008864C1 /* curl.xcframework */; }; - BFB0B3F72C50DFE8008FB5A3 /* openssl.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF6276A12BAD6619008864C1 /* openssl.xcframework */; }; - BFB0B3F82C50DFE8008FB5A3 /* pixman.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF5BF8552B737E930049DEF6 /* pixman.xcframework */; }; - BFB0B3F92C50DFE8008FB5A3 /* libpng.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF5BF8532B737E880049DEF6 /* libpng.xcframework */; }; - BFB0B3FA2C50DFE8008FB5A3 /* glfw.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF5BF8512B737E4E0049DEF6 /* glfw.xcframework */; }; - BFB0B3FB2C50DFE8008FB5A3 /* glew.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF5BF84F2B737E440049DEF6 /* glew.xcframework */; }; - BFB0B3FC2C50DFE8008FB5A3 /* freetype.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF5BF84D2B737E3B0049DEF6 /* freetype.xcframework */; }; - BFB0B3FD2C50DFE8008FB5A3 /* FreeImage.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF5BF84B2B737E320049DEF6 /* FreeImage.xcframework */; }; - BFB0B3FE2C50DFE8008FB5A3 /* cairo.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF5BF8492B737E260049DEF6 /* cairo.xcframework */; }; - BFB0B3FF2C50DFE8008FB5A3 /* pugixml.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF5BF8472B737D280049DEF6 /* pugixml.xcframework */; }; - BFB0B4002C50DFE8008FB5A3 /* rtAudio.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF5BF8452B737C870049DEF6 /* rtAudio.xcframework */; }; - BFB0B4012C50DFE8008FB5A3 /* tess2.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF5BF8432B737C7C0049DEF6 /* tess2.xcframework */; }; - BFB0B4022C50DFE8008FB5A3 /* uriparser.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF5BF8412B737C700049DEF6 /* uriparser.xcframework */; }; - BFB0B4032C50DFE8008FB5A3 /* zlib.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF5BF83F2B737C0A0049DEF6 /* zlib.xcframework */; }; DA48FE78131D85A6000062BC /* ofPolyline.h in Headers */ = {isa = PBXBuildFile; fileRef = DA48FE74131D85A6000062BC /* ofPolyline.h */; }; DA94C2F01301D32200CCC773 /* ofRendererCollection.h in Headers */ = {isa = PBXBuildFile; fileRef = DA94C2ED1301D32200CCC773 /* ofRendererCollection.h */; }; DA97FD3C12F5A61A005C9991 /* ofCairoRenderer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DA97FD3612F5A61A005C9991 /* ofCairoRenderer.cpp */; }; @@ -84,6 +66,7 @@ DAC22D3F16E7A4AF0020226D /* ofParameter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DAC22D3B16E7A4AF0020226D /* ofParameter.cpp */; }; DAC22D4016E7A4AF0020226D /* ofParameter.h in Headers */ = {isa = PBXBuildFile; fileRef = DAC22D3C16E7A4AF0020226D /* ofParameter.h */; }; DAC22D4116E7A4AF0020226D /* ofParameterGroup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DAC22D3D16E7A4AF0020226D /* ofParameterGroup.cpp */; }; + DAC22D4216E7A4AF0020226D /* ofParameterGroup.h in Headers */ = {isa = PBXBuildFile; fileRef = DAC22D3E16E7A4AF0020226D /* ofParameterGroup.h */; }; DACFA8DA132D09E8008D4B7A /* ofFbo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DACFA8C9132D09E8008D4B7A /* ofFbo.cpp */; }; DACFA8DB132D09E8008D4B7A /* ofFbo.h in Headers */ = {isa = PBXBuildFile; fileRef = DACFA8CA132D09E8008D4B7A /* ofFbo.h */; }; DACFA8DC132D09E8008D4B7A /* ofGLRenderer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DACFA8CB132D09E8008D4B7A /* ofGLRenderer.cpp */; }; @@ -101,8 +84,6 @@ DACFA8E8132D09E8008D4B7A /* ofVbo.h in Headers */ = {isa = PBXBuildFile; fileRef = DACFA8D7132D09E8008D4B7A /* ofVbo.h */; }; DACFA8E9132D09E8008D4B7A /* ofVboMesh.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DACFA8D8132D09E8008D4B7A /* ofVboMesh.cpp */; }; DACFA8EA132D09E8008D4B7A /* ofVboMesh.h in Headers */ = {isa = PBXBuildFile; fileRef = DACFA8D9132D09E8008D4B7A /* ofVboMesh.h */; }; - E43EEAC329E66B78001C7596 /* ofAVEngineSoundPlayer.mm in Sources */ = {isa = PBXBuildFile; fileRef = E43EEAC129E66B78001C7596 /* ofAVEngineSoundPlayer.mm */; }; - E43EEAC429E66B78001C7596 /* ofAVEngineSoundPlayer.h in Headers */ = {isa = PBXBuildFile; fileRef = E43EEAC229E66B78001C7596 /* ofAVEngineSoundPlayer.h */; }; E486629A1D8C61B000D1735C /* ofAVFoundationGrabber.h in Headers */ = {isa = PBXBuildFile; fileRef = E48662981D8C61B000D1735C /* ofAVFoundationGrabber.h */; }; E486629B1D8C61B000D1735C /* ofAVFoundationGrabber.mm in Sources */ = {isa = PBXBuildFile; fileRef = E48662991D8C61B000D1735C /* ofAVFoundationGrabber.mm */; }; E495DF7D178896A900994238 /* ofAppNoWindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E495DF7B178896A900994238 /* ofAppNoWindow.cpp */; }; @@ -179,8 +160,6 @@ /* End PBXBuildFile section */ /* Begin PBXFileReference section */ - 0353245B2BEFEC7A00B50A35 /* ofTimerFps.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofTimerFps.h; sourceTree = ""; }; - 0353245C2BEFEC7B00B50A35 /* ofTimerFps.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ofTimerFps.cpp; sourceTree = ""; }; 19662F2C2834A44400B622ED /* ofGraphicsCairo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofGraphicsCairo.h; sourceTree = ""; }; 19662F2D2834A44400B622ED /* ofGraphicsCairo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ofGraphicsCairo.cpp; sourceTree = ""; }; 22246D91176C9987008A8AF4 /* ofGLProgrammableRenderer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ofGLProgrammableRenderer.cpp; path = gl/ofGLProgrammableRenderer.cpp; sourceTree = ""; }; @@ -235,22 +214,6 @@ 9979E8201A1CCC44007E55D1 /* ofMainLoop.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ofMainLoop.cpp; sourceTree = ""; }; 9979E8211A1CCC44007E55D1 /* ofMainLoop.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofMainLoop.h; sourceTree = ""; }; BBA81C421FFBE4DB0064EA94 /* ofBaseApp.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ofBaseApp.cpp; sourceTree = ""; }; - BF5BF83F2B737C0A0049DEF6 /* zlib.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = zlib.xcframework; path = ../../../zlib/lib/macos/zlib.xcframework; sourceTree = ""; }; - BF5BF8412B737C700049DEF6 /* uriparser.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = uriparser.xcframework; path = ../../../uriparser/lib/macos/uriparser.xcframework; sourceTree = ""; }; - BF5BF8432B737C7C0049DEF6 /* tess2.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = tess2.xcframework; path = ../../../tess2/lib/macos/tess2.xcframework; sourceTree = ""; }; - BF5BF8452B737C870049DEF6 /* rtAudio.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = rtAudio.xcframework; path = ../../../rtAudio/lib/macos/rtAudio.xcframework; sourceTree = ""; }; - BF5BF8472B737D280049DEF6 /* pugixml.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = pugixml.xcframework; path = ../../../pugixml/lib/macos/pugixml.xcframework; sourceTree = ""; }; - BF5BF8492B737E260049DEF6 /* cairo.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = cairo.xcframework; path = ../../../cairo/lib/macos/cairo.xcframework; sourceTree = ""; }; - BF5BF84B2B737E320049DEF6 /* FreeImage.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = FreeImage.xcframework; path = ../../../FreeImage/lib/macos/FreeImage.xcframework; sourceTree = ""; }; - BF5BF84D2B737E3B0049DEF6 /* freetype.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = freetype.xcframework; path = ../../../freetype/lib/macos/freetype.xcframework; sourceTree = ""; }; - BF5BF84F2B737E440049DEF6 /* glew.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = glew.xcframework; path = ../../../glew/lib/macos/glew.xcframework; sourceTree = ""; }; - BF5BF8512B737E4E0049DEF6 /* glfw.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = glfw.xcframework; path = ../../../glfw/lib/macos/glfw.xcframework; sourceTree = ""; }; - BF5BF8532B737E880049DEF6 /* libpng.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = libpng.xcframework; path = ../../../libpng/lib/macos/libpng.xcframework; sourceTree = ""; }; - BF5BF8552B737E930049DEF6 /* pixman.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = pixman.xcframework; path = ../../../pixman/lib/macos/pixman.xcframework; sourceTree = ""; }; - BF6276A12BAD6619008864C1 /* openssl.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = openssl.xcframework; path = ../../../openssl/lib/macos/openssl.xcframework; sourceTree = ""; }; - BF6276A32BAD6639008864C1 /* curl.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = curl.xcframework; path = ../../../curl/lib/macos/curl.xcframework; sourceTree = ""; }; - BF6276A52BAD9900008864C1 /* ofBaseTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofBaseTypes.h; sourceTree = ""; }; - BF7C462D2C097CCE00461163 /* brotli.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = brotli.xcframework; path = ../../../brotli/lib/macos/brotli.xcframework; sourceTree = ""; }; DA48FE74131D85A6000062BC /* ofPolyline.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofPolyline.h; sourceTree = ""; }; DA94C2ED1301D32200CCC773 /* ofRendererCollection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofRendererCollection.h; sourceTree = ""; }; DA97FD3612F5A61A005C9991 /* ofCairoRenderer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ofCairoRenderer.cpp; sourceTree = ""; }; @@ -258,6 +221,7 @@ DAC22D3B16E7A4AF0020226D /* ofParameter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ofParameter.cpp; sourceTree = ""; }; DAC22D3C16E7A4AF0020226D /* ofParameter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofParameter.h; sourceTree = ""; }; DAC22D3D16E7A4AF0020226D /* ofParameterGroup.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ofParameterGroup.cpp; sourceTree = ""; }; + DAC22D3E16E7A4AF0020226D /* ofParameterGroup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofParameterGroup.h; sourceTree = ""; }; DACFA8C9132D09E8008D4B7A /* ofFbo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ofFbo.cpp; path = gl/ofFbo.cpp; sourceTree = ""; }; DACFA8CA132D09E8008D4B7A /* ofFbo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofFbo.h; path = gl/ofFbo.h; sourceTree = ""; }; DACFA8CB132D09E8008D4B7A /* ofGLRenderer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ofGLRenderer.cpp; path = gl/ofGLRenderer.cpp; sourceTree = ""; }; @@ -278,8 +242,6 @@ E432815E138ABFDD0047C5CB /* Shared.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Shared.xcconfig; sourceTree = ""; }; E432815F138AC0470047C5CB /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = ""; }; E4328160138AC04A0047C5CB /* Release.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = ""; }; - E43EEAC129E66B78001C7596 /* ofAVEngineSoundPlayer.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ofAVEngineSoundPlayer.mm; sourceTree = ""; }; - E43EEAC229E66B78001C7596 /* ofAVEngineSoundPlayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofAVEngineSoundPlayer.h; sourceTree = ""; }; E48662981D8C61B000D1735C /* ofAVFoundationGrabber.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.h; fileEncoding = 4; path = ofAVFoundationGrabber.h; sourceTree = ""; }; E48662991D8C61B000D1735C /* ofAVFoundationGrabber.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ofAVFoundationGrabber.mm; sourceTree = ""; }; E495DF7B178896A900994238 /* ofAppNoWindow.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ofAppNoWindow.cpp; sourceTree = ""; }; @@ -372,56 +334,12 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - BFB0B3F52C50DFE8008FB5A3 /* brotli.xcframework in Frameworks */, - BFB0B3F62C50DFE8008FB5A3 /* curl.xcframework in Frameworks */, - BFB0B3F72C50DFE8008FB5A3 /* openssl.xcframework in Frameworks */, - BFB0B3F82C50DFE8008FB5A3 /* pixman.xcframework in Frameworks */, - BFB0B3F92C50DFE8008FB5A3 /* libpng.xcframework in Frameworks */, - BFB0B3FA2C50DFE8008FB5A3 /* glfw.xcframework in Frameworks */, - BFB0B3FB2C50DFE8008FB5A3 /* glew.xcframework in Frameworks */, - BFB0B3FC2C50DFE8008FB5A3 /* freetype.xcframework in Frameworks */, - BFB0B3FD2C50DFE8008FB5A3 /* FreeImage.xcframework in Frameworks */, - BFB0B3FE2C50DFE8008FB5A3 /* cairo.xcframework in Frameworks */, - BFB0B3FF2C50DFE8008FB5A3 /* pugixml.xcframework in Frameworks */, - BFB0B4002C50DFE8008FB5A3 /* rtAudio.xcframework in Frameworks */, - BFB0B4012C50DFE8008FB5A3 /* tess2.xcframework in Frameworks */, - BFB0B4022C50DFE8008FB5A3 /* uriparser.xcframework in Frameworks */, - BFB0B4032C50DFE8008FB5A3 /* zlib.xcframework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - BF5BF83E2B7378ED0049DEF6 /* frameworks */ = { - isa = PBXGroup; - children = ( - BF7C462D2C097CCE00461163 /* brotli.xcframework */, - BF6276A32BAD6639008864C1 /* curl.xcframework */, - BF6276A12BAD6619008864C1 /* openssl.xcframework */, - BF5BF8552B737E930049DEF6 /* pixman.xcframework */, - BF5BF8532B737E880049DEF6 /* libpng.xcframework */, - BF5BF8512B737E4E0049DEF6 /* glfw.xcframework */, - BF5BF84F2B737E440049DEF6 /* glew.xcframework */, - BF5BF84D2B737E3B0049DEF6 /* freetype.xcframework */, - BF5BF84B2B737E320049DEF6 /* FreeImage.xcframework */, - BF5BF8492B737E260049DEF6 /* cairo.xcframework */, - BF5BF8472B737D280049DEF6 /* pugixml.xcframework */, - BF5BF8452B737C870049DEF6 /* rtAudio.xcframework */, - BF5BF8432B737C7C0049DEF6 /* tess2.xcframework */, - BF5BF8412B737C700049DEF6 /* uriparser.xcframework */, - BF5BF83F2B737C0A0049DEF6 /* zlib.xcframework */, - ); - name = frameworks; - sourceTree = ""; - }; - BF879F602C0F7FE400200951 /* Frameworks */ = { - isa = PBXGroup; - children = ( - ); - name = Frameworks; - sourceTree = ""; - }; DACFA8C8132D09C7008D4B7A /* gl */ = { isa = PBXGroup; children = ( @@ -543,19 +461,17 @@ E4B69B4A0A3A1720003C02F2 = { isa = PBXGroup; children = ( - E4EB6916138AFC8500A09F29 /* CoreOF.xcconfig */, E432815E138ABFDD0047C5CB /* Shared.xcconfig */, + E4EB6916138AFC8500A09F29 /* CoreOF.xcconfig */, E432815F138AC0470047C5CB /* Debug.xcconfig */, E4328160138AC04A0047C5CB /* Release.xcconfig */, E4B27AAA10CBE92A00536013 /* openFrameworks */, E4B27C1510CBEB8E00536013 /* openFrameworksDebug.a */, - BF5BF83E2B7378ED0049DEF6 /* frameworks */, - BF879F602C0F7FE400200951 /* Frameworks */, ); indentWidth = 4; sourceTree = ""; tabWidth = 4; - usesTabs = 1; + usesTabs = 0; }; E4F3BA5212F4C4BF002D19BB /* 3d */ = { isa = PBXGroup; @@ -580,8 +496,6 @@ E4F3BA7B12F4C4C9002D19BB /* sound */ = { isa = PBXGroup; children = ( - E43EEAC229E66B78001C7596 /* ofAVEngineSoundPlayer.h */, - E43EEAC129E66B78001C7596 /* ofAVEngineSoundPlayer.mm */, 6944251D1FE4548B00770088 /* ofSoundBaseTypes.cpp */, 6944251E1FE4548B00770088 /* ofSoundBaseTypes.h */, E4F3BA7E12F4C4C9002D19BB /* ofFmodSoundPlayer.cpp */, @@ -628,10 +542,10 @@ E4F3BACF12F4C73C002D19BB /* types */ = { isa = PBXGroup; children = ( - BF6276A52BAD9900008864C1 /* ofBaseTypes.h */, DAC22D3B16E7A4AF0020226D /* ofParameter.cpp */, DAC22D3C16E7A4AF0020226D /* ofParameter.h */, DAC22D3D16E7A4AF0020226D /* ofParameterGroup.cpp */, + DAC22D3E16E7A4AF0020226D /* ofParameterGroup.h */, E4F3BAD012F4C73C002D19BB /* ofBaseTypes.cpp */, E4F3BAD212F4C73C002D19BB /* ofColor.cpp */, E4F3BAD312F4C73C002D19BB /* ofColor.h */, @@ -651,8 +565,6 @@ 692C298819DC5C5500C27C5D /* ofFpsCounter.h */, 692C298919DC5C5500C27C5D /* ofTimer.cpp */, 692C298A19DC5C5500C27C5D /* ofTimer.h */, - 0353245C2BEFEC7B00B50A35 /* ofTimerFps.cpp */, - 0353245B2BEFEC7A00B50A35 /* ofTimerFps.h */, 27DEA30F1796F578000A9E90 /* ofXml.cpp */, 27DEA3101796F578000A9E90 /* ofXml.h */, 2276958F170D9DD200604FC3 /* ofMatrixStack.cpp */, @@ -723,7 +635,6 @@ 30CC5385207A36FD008234AF /* ofMathConstants.h in Headers */, E4F3BA6A12F4C4BF002D19BB /* ofCamera.h in Headers */, E4F3BA6C12F4C4BF002D19BB /* ofEasyCam.h in Headers */, - 0353245D2BEFEC7B00B50A35 /* ofTimerFps.h in Headers */, E4F3BA7412F4C4BF002D19BB /* ofNode.h in Headers */, E4F3BA8B12F4C4C9002D19BB /* ofFmodSoundPlayer.h in Headers */, E4F3BA8F12F4C4C9002D19BB /* ofSoundPlayer.h in Headers */, @@ -787,8 +698,7 @@ 772BDF74146928600030F0EE /* ofOpenALSoundPlayer.h in Headers */, E486629A1D8C61B000D1735C /* ofAVFoundationGrabber.h in Headers */, DAC22D4016E7A4AF0020226D /* ofParameter.h in Headers */, - E43EEAC429E66B78001C7596 /* ofAVEngineSoundPlayer.h in Headers */, - BF6276A62BAD9900008864C1 /* ofBaseTypes.h in Headers */, + DAC22D4216E7A4AF0020226D /* ofParameterGroup.h in Headers */, 2E6EA7011603A9E400B7ADF3 /* of3dGraphics.h in Headers */, 2292E73F19E3049700DE9411 /* ofBufferObject.h in Headers */, 2E6EA7061603AABD00B7ADF3 /* of3dPrimitives.h in Headers */, @@ -809,11 +719,9 @@ isa = PBXNativeTarget; buildConfigurationList = E4B27C3210CBEBB200536013 /* Build configuration list for PBXNativeTarget "openFrameworks" */; buildPhases = ( - BFEF3FA72C50AEC7009B3CD8 /* Run Script */, E4B27C1110CBEB8E00536013 /* Headers */, E4B27C1210CBEB8E00536013 /* Sources */, E4B27C1310CBEB8E00536013 /* Frameworks */, - BFF80A5D2C50B2C300784E74 /* ShellScript */, ); buildRules = ( ); @@ -830,8 +738,7 @@ E4B69B4C0A3A1720003C02F2 /* Project object */ = { isa = PBXProject; attributes = { - BuildIndependentTargetsInParallel = YES; - LastUpgradeCheck = 1530; + LastUpgradeCheck = 0600; }; buildConfigurationList = E4B69B4D0A3A1720003C02F2 /* Build configuration list for PBXProject "openFrameworksLib" */; compatibilityVersion = "Xcode 3.2"; @@ -853,48 +760,6 @@ }; /* End PBXProject section */ -/* Begin PBXShellScriptBuildPhase section */ - BFEF3FA72C50AEC7009B3CD8 /* Run Script */ = { - isa = PBXShellScriptBuildPhase; - alwaysOutOfDate = 1; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - ); - name = "Run Script"; - outputFileListPaths = ( - ); - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = "/usr/bin/env bash"; - shellScript = "#!/usr/bin/env bash\nif [ ! -d \"${SRCROOT}/../../../freetype/lib/macos/freetype.xcframework\" ]; then\n\techo \"openFrameworks has missing xcFrameworks for osx. Downloading libaries now via scripts/osx/download_libs.sh\"\n ${SRCROOT}/../../../../scripts/osx/download_libs.sh\nelse\n\techo \"xcFrameworks found\"\nfi\n"; - showEnvVarsInLog = 0; - }; - BFF80A5D2C50B2C300784E74 /* ShellScript */ = { - isa = PBXShellScriptBuildPhase; - alwaysOutOfDate = 1; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - ); - outputFileListPaths = ( - ); - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "#!/bin/sh\nTARGET_DIR=\"$SRCROOT/../../lib/macos\"\nATTRIBUTE_CHECK=$(xattr -p com.apple.xcode.CreatedByBuildSystem \"$TARGET_DIR\" 2>/dev/null)\nif [ -z \"$ATTRIBUTE_CHECK\" ]; then\n xattr -w com.apple.xcode.CreatedByBuildSystem true \"$TARGET_DIR\"\n echo \"Attribute com.apple.xcode.CreatedByBuildSystem set to true for $TARGET_DIR\"\nelse\n echo \"Attribute com.apple.xcode.CreatedByBuildSystem already set for $TARGET_DIR\"\nfi\n"; - showEnvVarsInLog = 0; - }; -/* End PBXShellScriptBuildPhase section */ - /* Begin PBXSourcesBuildPhase section */ E4B27C1210CBEB8E00536013 /* Sources */ = { isa = PBXSourcesBuildPhase; @@ -916,7 +781,6 @@ E4F3BA8A12F4C4C9002D19BB /* ofFmodSoundPlayer.cpp in Sources */, E4F3BA8E12F4C4C9002D19BB /* ofSoundPlayer.cpp in Sources */, E4F3BA9012F4C4C9002D19BB /* ofSoundStream.cpp in Sources */, - E43EEAC329E66B78001C7596 /* ofAVEngineSoundPlayer.mm in Sources */, E4F3BAC112F4C72F002D19BB /* ofMath.cpp in Sources */, E4F3BAC312F4C72F002D19BB /* ofMatrix3x3.cpp in Sources */, 6944251A1FE4547400770088 /* ofGraphicsBaseTypes.cpp in Sources */, @@ -940,7 +804,6 @@ E4F3BB1812F4C752002D19BB /* ofBitmapFont.cpp in Sources */, E4F3BB1C12F4C752002D19BB /* ofGraphics.cpp in Sources */, 2E6EA7041603AA7A00B7ADF3 /* of3dGraphics.cpp in Sources */, - 0353245E2BEFEC7B00B50A35 /* ofTimerFps.cpp in Sources */, E4F3BB1E12F4C752002D19BB /* ofImage.cpp in Sources */, E4F3BB2012F4C752002D19BB /* ofPixels.cpp in Sources */, E4F3BB2A12F4C752002D19BB /* ofTessellator.cpp in Sources */, @@ -982,7 +845,9 @@ E4B27C1610CBEB8E00536013 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - CONFIGURATION_BUILD_DIR = "$(SRCROOT)/../../lib/macos/"; + COMBINE_HIDPI_IMAGES = YES; + CONFIGURATION_BUILD_DIR = "$(SRCROOT)/../../lib/osx/"; + COPY_PHASE_STRIP = NO; EXECUTABLE_PREFIX = ""; INSTALL_PATH = /usr/local/lib; LIBRARY_SEARCH_PATHS = ( @@ -997,18 +862,22 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_8)", "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_9)", ); - OBJROOT = "$(SRCROOT)/../../lib/macos/build/debug/"; + OBJROOT = "$(SRCROOT)/../../lib/osx/build/debug/"; PRODUCT_NAME = openFrameworksDebug; SDKROOT = ""; + SKIP_INSTALL = YES; }; name = Debug; }; E4B27C1710CBEB8E00536013 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - CONFIGURATION_BUILD_DIR = "$(SRCROOT)/../../lib/macos/"; + COMBINE_HIDPI_IMAGES = YES; + CONFIGURATION_BUILD_DIR = "$(SRCROOT)/../../lib/osx/"; + COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; EXECUTABLE_PREFIX = ""; + GCC_FAST_MATH = NO; INSTALL_PATH = /usr/local/lib; LIBRARY_SEARCH_PATHS = ( "$(inherited)", @@ -1022,9 +891,10 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_8)", "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_9)", ); - OBJROOT = "$(SRCROOT)/../../lib/macos/build/release/"; + OBJROOT = "$(SRCROOT)/../../lib/osx/build/release/"; PRODUCT_NAME = openFrameworks; SDKROOT = ""; + SKIP_INSTALL = YES; }; name = Release; }; @@ -1032,9 +902,9 @@ isa = XCBuildConfiguration; baseConfigurationReference = E432815F138AC0470047C5CB /* Debug.xcconfig */; buildSettings = { - CONFIGURATION_BUILD_DIR = "$(SRCROOT)/../../lib/macos/"; - CONFIGURATION_TEMP_DIR = "$(SRCROOT)/../../lib/macos/build/debug/"; - OBJROOT = "$(SRCROOT)/../../lib/macos/build/debug/"; + CONFIGURATION_BUILD_DIR = "$(SRCROOT)/../../lib/osx/"; + CONFIGURATION_TEMP_DIR = "$(SRCROOT)/../../lib/osx/build/debug/"; + OBJROOT = "$(SRCROOT)/../../lib/osx/build/debug/"; ONLY_ACTIVE_ARCH = NO; SDKROOT = ""; }; @@ -1044,9 +914,9 @@ isa = XCBuildConfiguration; baseConfigurationReference = E4328160138AC04A0047C5CB /* Release.xcconfig */; buildSettings = { - CONFIGURATION_BUILD_DIR = "$(SRCROOT)/../../lib/macos/"; - CONFIGURATION_TEMP_DIR = "$(SRCROOT)/../../lib/macos/build/release/"; - OBJROOT = "$(SRCROOT)/../../lib/macos/build/release"; + CONFIGURATION_BUILD_DIR = "$(SRCROOT)/../../lib/osx/"; + CONFIGURATION_TEMP_DIR = "$(SRCROOT)/../../lib/osx/build/release/"; + OBJROOT = "$(SRCROOT)/../../lib/osx/build/release"; ONLY_ACTIVE_ARCH = NO; SDKROOT = ""; }; From caf0194073569f01c6cd1ef1112f85aa72ecc881 Mon Sep 17 00:00:00 2001 From: Dimitre Date: Sat, 2 Nov 2024 23:06:44 -0300 Subject: [PATCH 02/22] revert ofShader --- libs/openFrameworks/gl/ofShader.cpp | 97 +++++++++-------------------- 1 file changed, 31 insertions(+), 66 deletions(-) diff --git a/libs/openFrameworks/gl/ofShader.cpp b/libs/openFrameworks/gl/ofShader.cpp index 3a197a0099d..b4df3358905 100644 --- a/libs/openFrameworks/gl/ofShader.cpp +++ b/libs/openFrameworks/gl/ofShader.cpp @@ -112,9 +112,9 @@ ofShader::ofShader(const ofShader & mom) , shaders(mom.shaders) , uniformsCache(mom.uniformsCache) , attributesBindingsCache(mom.attributesBindingsCache) -//#ifndef TARGET_OPENGLES +#ifndef TARGET_OPENGLES , uniformBlocksCache(mom.uniformBlocksCache) -//#endif +#endif { if (mom.bLoaded) { retainProgram(program); @@ -713,9 +713,9 @@ bool ofShader::linkProgram() { } } -//#ifndef TARGET_OPENGLES +#ifndef TARGET_OPENGLES #ifdef GLEW_ARB_uniform_buffer_object - if (GLEW_ARB_uniform_buffer_object) { + if (GLEW_ARB_uniform_buffer_object) { // Pre-cache all active uniforms blocks GLint numUniformBlocks = 0; glGetProgramiv(program, GL_ACTIVE_UNIFORM_BLOCKS, &numUniformBlocks); @@ -726,13 +726,11 @@ bool ofShader::linkProgram() { for (GLint i = 0; i < numUniformBlocks; i++) { glGetActiveUniformBlockName(program, i, uniformMaxLength, &length, uniformBlockName.data()); string name(uniformBlockName.begin(), uniformBlockName.begin() + length); -// std::cout << "WOW name " << name << std::endl; - bufferObjectsCache[name] = std::make_unique(); uniformBlocksCache[name] = glGetUniformBlockIndex(program, name.c_str()); } - } + } #endif -//#endif +#endif #ifdef TARGET_ANDROID ofAddListener(ofxAndroidEvents().unloadGL, this, &ofShader::unloadGL); @@ -768,11 +766,11 @@ void ofShader::reloadGL() { auto bindings = attributesBindingsCache; shaders.clear(); uniformsCache.clear(); - //#ifndef TARGET_OPENGLES + #ifndef TARGET_OPENGLES #ifdef GLEW_ARB_uniform_buffer_object // Core in OpenGL 3.1 uniformBlocksCache.clear(); #endif - //#endif + #endif attributesBindingsCache.clear(); for (auto & shader : source) { auto source = shader.second.source; @@ -823,11 +821,11 @@ void ofShader::unload() { shaders.clear(); uniformsCache.clear(); -//#ifndef TARGET_OPENGLES +#ifndef TARGET_OPENGLES #ifdef GLEW_ARB_uniform_buffer_object // Core in OpenGL 3.1 uniformBlocksCache.clear(); #endif -//#endif +#endif attributesBindingsCache.clear(); #ifdef TARGET_ANDROID ofRemoveListener(ofxAndroidEvents().reloadGL, this, &ofShader::reloadGL); @@ -1020,23 +1018,6 @@ void ofShader::setUniform4i(const string & name, int v1, int v2, int v3, int v4) } } -//-------------------------------------------------------------- -void ofShader::setUniformBufferObject(const std::string & name, const void * data, GLsizeiptr dataSize) const { - if (bufferObjectsCache.find(name) != bufferObjectsCache.end()) { - if (!bufferObjectsCache.at(name)->isAllocated()) { - bufferObjectsCache.at(name)->allocate(dataSize, GL_STATIC_DRAW); - } - bufferObjectsCache.at(name)->updateData(dataSize, data); - bufferObjectsCache.at(name)->bindBase(GL_UNIFORM_BUFFER, getUniformBlockIndex(name)); - } else { -// bufferObjectsCache.at(name) = std::make_unique(); -// for (const auto & b : bufferObjectsCache) { -// std::cout << b.first << std::endl; -// } -// std::cout << "setUniformBufferObject don't exist " << name << std::endl; - } -} - //-------------------------------------------------------------- void ofShader::setUniform1f(const string & name, float v1) const { if (bLoaded) { @@ -1170,11 +1151,9 @@ void ofShader::setUniforms(const ofParameterGroup & parameters) const { setUniform2f(parameters[i].getEscapedName(), parameters[i].cast()); } else if (parameters[i].type() == typeid(ofParameter).name()) { setUniform3f(parameters[i].getEscapedName(), parameters[i].cast()); - } -// else if (parameters[i].type() == typeid(ofParameter).name()) { -// setUniform4f(parameters[i].getEscapedName(), parameters[i].cast()); -// } - else if (parameters[i].type() == typeid(ofParameterGroup).name()) { + } else if (parameters[i].type() == typeid(ofParameter).name()) { + setUniform4f(parameters[i].getEscapedName(), parameters[i].cast()); + } else if (parameters[i].type() == typeid(ofParameterGroup).name()) { setUniforms((ofParameterGroup &)parameters[i]); } } @@ -1332,52 +1311,45 @@ GLint ofShader::getUniformLocation(const string & name) const { } } -//#ifndef TARGET_OPENGLES -// #ifdef GLEW_ARB_uniform_buffer_object +#ifndef TARGET_OPENGLES + #ifdef GLEW_ARB_uniform_buffer_object //-------------------------------------------------------------- GLint ofShader::getUniformBlockIndex(const string & name) const { if (!bLoaded) return -1; -// if (GLEW_ARB_uniform_buffer_object) { -#ifdef GLEW_ARB_uniform_buffer_object + if (GLEW_ARB_uniform_buffer_object) { auto it = uniformBlocksCache.find(name); if (it == uniformBlocksCache.end()) { return -1; } else { return it->second; } -#else - // } else { + } else { ofLogError("ofShader::getUniformBlockIndex") << "Sorry, it looks like you can't run 'ARB_uniform_buffer_object'"; return -1; -// } -#endif + } } //-------------------------------------------------------------- GLint ofShader::getUniformBlockBinding(const string & name) const { if (!bLoaded) return -1; -#ifdef GLEW_ARB_uniform_buffer_object -// if (GLEW_ARB_uniform_buffer_object) { + if (GLEW_ARB_uniform_buffer_object) { GLint index = getUniformBlockIndex(name); if (index == -1) return -1; GLint blockBinding; glGetActiveUniformBlockiv(program, index, GL_UNIFORM_BLOCK_BINDING, &blockBinding); return blockBinding; -#else -//} else { + } else { ofLogError("ofShader::getUniformBlockBinding") << "Sorry, it looks like you can't run 'ARB_uniform_buffer_object'"; return -1; -// } -#endif + } } //-------------------------------------------------------------- void ofShader::printActiveUniformBlocks() const { -#ifdef GLEW_ARB_uniform_buffer_object -// if (GLEW_ARB_uniform_buffer_object) { + if (GLEW_ARB_uniform_buffer_object) { GLint numUniformBlocks = 0; glGetProgramiv(program, GL_ACTIVE_UNIFORM_BLOCKS, &numUniformBlocks); ofLogNotice("ofShader") << numUniformBlocks << " uniform blocks"; @@ -1404,32 +1376,25 @@ void ofShader::printActiveUniformBlocks() const { line.str(""); } delete[] uniformBlockName; -#else -//} else { + } else { ofLogError("ofShader::printActiveUniformBlocks") << "Sorry, it looks like you can't run 'ARB_uniform_buffer_object'"; -#endif -//} + } } void ofShader::bindUniformBlock(GLuint binding, const string & name) const { - if (!bLoaded) return; - - -#ifdef GLEW_ARB_uniform_buffer_object -// if (GLEW_ARB_uniform_buffer_object) { + if (bLoaded) { + if (GLEW_ARB_uniform_buffer_object) { GLint index = getUniformBlockIndex(name); if (index != -1) { glUniformBlockBinding(program, index, binding); } -#else -// } else { + } else { ofLogError("ofShader::bindUniformBlock") << "Sorry, it looks like you can't run 'ARB_uniform_buffer_object'"; -// } -#endif - + } + } } -// #endif -//#endif + #endif +#endif //-------------------------------------------------------------- void ofShader::printActiveUniforms() const { From 6b1dfc4b6b5e4dc52c96f02871742f4627e1a734 Mon Sep 17 00:00:00 2001 From: Dimitre Date: Sat, 2 Nov 2024 23:10:21 -0300 Subject: [PATCH 03/22] cleanup --- addons/ofxAssimpModelLoader/src/ofxAssimpModelLoader.cpp | 6 ------ libs/openFrameworks/3d/of3dPrimitives.cpp | 2 -- 2 files changed, 8 deletions(-) diff --git a/addons/ofxAssimpModelLoader/src/ofxAssimpModelLoader.cpp b/addons/ofxAssimpModelLoader/src/ofxAssimpModelLoader.cpp index d165ad063d0..4927c38188e 100644 --- a/addons/ofxAssimpModelLoader/src/ofxAssimpModelLoader.cpp +++ b/addons/ofxAssimpModelLoader/src/ofxAssimpModelLoader.cpp @@ -5,7 +5,6 @@ #include "ofPixels.h" #include "ofGraphics.h" #include "ofConstants.h" -//#include "ofMatrix4x4.h" #include "ofUtils.h" // ofGetElapsedTimef #include @@ -587,17 +586,12 @@ void ofxAssimpModelLoader::updateMeshes(aiNode * node, glm::mat4 parentMatrix) { aiMatrix4x4 m = node->mTransformation; m.Transpose(); - // FIXME: - mat4 glm::mat4 matrix( m.a1, m.a2, m.a3, m.a4, m.b1, m.b2, m.b3, m.b4, m.c1, m.c2, m.c3, m.c4, m.d1, m.d2, m.d3, m.d4 ); -// ofMatrix4x4 matrix(m.a1, m.a2, m.a3, m.a4, -// m.b1, m.b2, m.b3, m.b4, -// m.c1, m.c2, m.c3, m.c4, -// m.d1, m.d2, m.d3, m.d4); matrix *= parentMatrix; for(unsigned int i = 0; i < node->mNumMeshes; i++) { diff --git a/libs/openFrameworks/3d/of3dPrimitives.cpp b/libs/openFrameworks/3d/of3dPrimitives.cpp index 21a8657a975..2c9f0eebd39 100644 --- a/libs/openFrameworks/3d/of3dPrimitives.cpp +++ b/libs/openFrameworks/3d/of3dPrimitives.cpp @@ -249,7 +249,6 @@ void of3dPrimitive::drawNormals(float length, bool bFaceNormals) const{ vert = (vertices[i-2]+vertices[i-1]+vertices[i]) / 3; } normalsMesh.setVertex(i*2, vert); -// normal = glm::normalize(toGlm(normals[i])); normal = glm::normalize(normals[i]); normal *= length; normalsMesh.setVertex(i*2+1, vert+normal); @@ -257,7 +256,6 @@ void of3dPrimitive::drawNormals(float length, bool bFaceNormals) const{ } else { for(size_t i = 0; i < normals.size(); i++) { vert = vertices[i]; -// normal = glm::normalize(toGlm(normals[i])); normal = glm::normalize(normals[i]); normalsMesh.setVertex( i*2, vert); normal *= length; From b6413a716f1d074ce6714832271e294f2a464a78 Mon Sep 17 00:00:00 2001 From: Dimitre Date: Sun, 3 Nov 2024 00:11:08 -0300 Subject: [PATCH 04/22] update --- libs/openFrameworks/app/ofAppGLFWWindow.cpp | 4 +- libs/openFrameworks/gl/ofMaterial.cpp | 38 ------------------- libs/openFrameworks/gl/ofShader.cpp | 16 ++++---- libs/openFrameworks/gl/ofShader.h | 2 +- libs/openFrameworks/gl/ofVbo.h | 4 -- libs/openFrameworks/graphics/ofGraphics.h | 11 ++---- .../video/ofAVFoundationGrabber.mm | 1 - 7 files changed, 17 insertions(+), 59 deletions(-) diff --git a/libs/openFrameworks/app/ofAppGLFWWindow.cpp b/libs/openFrameworks/app/ofAppGLFWWindow.cpp index a44aacb0de2..2cd140153d4 100644 --- a/libs/openFrameworks/app/ofAppGLFWWindow.cpp +++ b/libs/openFrameworks/app/ofAppGLFWWindow.cpp @@ -141,8 +141,10 @@ void ofAppGLFWWindow::setup(const ofGLESWindowSettings & settings) { #endif const ofGLFWWindowSettings * glSettings = dynamic_cast(&settings); if (glSettings) { + std::cout << "FEIO 1" << std::endl; setup(*glSettings); } else { + std::cout << "FEIO 2" << std::endl; setup(ofGLFWWindowSettings(settings)); } } @@ -936,7 +938,7 @@ void ofAppGLFWWindow::setup(const ofGLESWindowSettings & settings) { // make sure to save current pos if not specified in settings if (settings.isPositionSet()) { auto pos = getWindowPosition(); - settings.setPosition(ofVec2f(pos.x, pos.y)); + settings.setPosition(pos); } //make sure the window is getting the mouse/key events diff --git a/libs/openFrameworks/gl/ofMaterial.cpp b/libs/openFrameworks/gl/ofMaterial.cpp index 222cead14f3..eb4f13169e5 100644 --- a/libs/openFrameworks/gl/ofMaterial.cpp +++ b/libs/openFrameworks/gl/ofMaterial.cpp @@ -1135,7 +1135,6 @@ void ofMaterial::updateLights(const ofShader & shader,ofGLProgrammableRenderer & shared_ptr light = ofLightsData()[i].lock(); if(!light || !light->isEnabled){ shader.setUniform1f("lights["+idx+"].enabled",0); -// lights[i].enabled = 0; continue; } glm::vec4 lightEyePosition = light->position; @@ -1155,35 +1154,20 @@ void ofMaterial::updateLights(const ofShader & shader,ofGLProgrammableRenderer & } if( light->lightType != OF_LIGHT_POINT ) { shader.setUniform3f("lights["+idx+"].direction", light->direction ); -// lights[i].direction = light->direction; } } -// lights[i].enabled = 1; -// lights[i].type = light->lightType; -// lights[i].position = lightEyePosition; - shader.setUniform1f("lights["+idx+"].enabled",1); shader.setUniform1f("lights["+idx+"].type", light->lightType); shader.setUniform4f("lights["+idx+"].position", lightEyePosition); if( !isPBR() ) { -// lights[i].ambient = light->ambientColor; -// lights[i].specular = light->specularColor; - shader.setUniform4f("lights["+idx+"].ambient", light->ambientColor); shader.setUniform4f("lights["+idx+"].specular", light->specularColor); } -// lights[idx].diffuse = light->diffuseColor; shader.setUniform4f("lights["+idx+"].diffuse", light->diffuseColor); if(light->lightType!=OF_LIGHT_DIRECTIONAL){ // TODO: add in light radius if pbr? - -// lights[idx].radius = 0.0f; -// lights[idx].constantAttenuation = light->attenuation_constant; -// lights[idx].linearAttenuation = light->attenuation_linear; -// lights[idx].quadraticAttenuation = light->attenuation_quadratic; - shader.setUniform1f("lights["+idx+"].radius", 0.0f); shader.setUniform1f("lights["+idx+"].constantAttenuation", light->attenuation_constant); shader.setUniform1f("lights["+idx+"].linearAttenuation", light->attenuation_linear); @@ -1198,16 +1182,9 @@ void ofMaterial::updateLights(const ofShader & shader,ofGLProgrammableRenderer & glm::vec4 direction4 = renderer.getCurrentViewMatrix() * glm::vec4(direction,1.0); direction = glm::vec3(direction4) / direction4.w; direction = direction - glm::vec3(lightEyePosition); - shader.setUniform3f("lights["+idx+"].spotDirection", glm::normalize(direction)); -// lights[idx].spotDirection = glm::normalize(direction); - } //shader.setUniform3f("lights["+idx+"].spotDirection", glm::normalize(direction)); -// lights[idx].spotExponent = light->exponent; -// lights[idx].spotCutoff = light->spotCutOff; -// lights[idx].spotCosCutoff = std::cos(glm::radians(light->spotCutOff))); - shader.setUniform1f("lights["+idx+"].spotExponent", light->exponent); shader.setUniform1f("lights["+idx+"].spotCutoff", light->spotCutOff); shader.setUniform1f("lights["+idx+"].spotCosCutoff", std::cos(glm::radians(light->spotCutOff))); @@ -1215,15 +1192,8 @@ void ofMaterial::updateLights(const ofShader & shader,ofGLProgrammableRenderer & if( !isPBR() ) { glm::vec3 halfVector(glm::normalize(glm::vec4(0.f, 0.f, 1.f, 0.f) + lightEyePosition)); shader.setUniform3f("lights["+idx+"].halfVector", halfVector); - -// lights[idx].halfVector = light->halfVector; - } }else if(light->lightType==OF_LIGHT_AREA){ - -// lights[idx].width = light->width; -// lights[idx].height = light->height; - shader.setUniform1f("lights["+idx+"].width", light->width); shader.setUniform1f("lights["+idx+"].height", light->height); glm::vec3 direction = light->direction; @@ -1232,9 +1202,6 @@ void ofMaterial::updateLights(const ofShader & shader,ofGLProgrammableRenderer & glm::vec4 direction4 = renderer.getCurrentViewMatrix() * glm::vec4(direction, 1.0); direction = glm::vec3(direction4) / direction4.w; direction = direction - glm::vec3(lightEyePosition); - -// lights[idx].spotDirection = glm::normalize(direction); - shader.setUniform3f("lights["+idx+"].spotDirection", glm::normalize(direction)); } @@ -1247,11 +1214,6 @@ void ofMaterial::updateLights(const ofShader & shader,ofGLProgrammableRenderer & right = right - glm::vec3(lightEyePosition); up = glm::cross(right, direction); } - - // FIXME: why toGlm in one and not in another? -// lights[idx].right = glm::normalize(toGlm(right)); -// lights[idx].up = glm::normalize(up)); - shader.setUniform3f("lights["+idx+"].right", glm::normalize(right)); shader.setUniform3f("lights["+idx+"].up", glm::normalize(up)); } diff --git a/libs/openFrameworks/gl/ofShader.cpp b/libs/openFrameworks/gl/ofShader.cpp index b4df3358905..d3eb77c8dfa 100644 --- a/libs/openFrameworks/gl/ofShader.cpp +++ b/libs/openFrameworks/gl/ofShader.cpp @@ -1147,13 +1147,15 @@ void ofShader::setUniforms(const ofParameterGroup & parameters) const { setUniform3f(parameters[i].getEscapedName(), parameters[i].cast()); } else if (parameters[i].type() == typeid(ofParameter).name()) { setUniform4f(parameters[i].getEscapedName(), parameters[i].cast()); - } else if (parameters[i].type() == typeid(ofParameter).name()) { - setUniform2f(parameters[i].getEscapedName(), parameters[i].cast()); - } else if (parameters[i].type() == typeid(ofParameter).name()) { - setUniform3f(parameters[i].getEscapedName(), parameters[i].cast()); - } else if (parameters[i].type() == typeid(ofParameter).name()) { - setUniform4f(parameters[i].getEscapedName(), parameters[i].cast()); - } else if (parameters[i].type() == typeid(ofParameterGroup).name()) { + } + // else if (parameters[i].type() == typeid(ofParameter).name()) { + // setUniform2f(parameters[i].getEscapedName(), parameters[i].cast()); + // } else if (parameters[i].type() == typeid(ofParameter).name()) { + // setUniform3f(parameters[i].getEscapedName(), parameters[i].cast()); + // } else if (parameters[i].type() == typeid(ofParameter).name()) { + // setUniform4f(parameters[i].getEscapedName(), parameters[i].cast()); + // } + else if (parameters[i].type() == typeid(ofParameterGroup).name()) { setUniforms((ofParameterGroup &)parameters[i]); } } diff --git a/libs/openFrameworks/gl/ofShader.h b/libs/openFrameworks/gl/ofShader.h index e52cdc18d26..eb71444e3fc 100644 --- a/libs/openFrameworks/gl/ofShader.h +++ b/libs/openFrameworks/gl/ofShader.h @@ -25,7 +25,7 @@ namespace glm { class ofTexture; class ofTextureData; -class ofMatrix3x3; +//class ofMatrix3x3; class ofParameterGroup; class ofBufferObject; class ofBaseHasTexture; diff --git a/libs/openFrameworks/gl/ofVbo.h b/libs/openFrameworks/gl/ofVbo.h index 9056a4c1d14..07cb14ef991 100644 --- a/libs/openFrameworks/gl/ofVbo.h +++ b/libs/openFrameworks/gl/ofVbo.h @@ -12,16 +12,12 @@ template class ofColor_; typedef ofColor_ ofFloatColor; -//class ofVec2f; -//class ofVec3f; - template class ofMesh_; using ofMesh = ofMesh_; class ofVbo { public: - ofVbo(); ofVbo(const ofVbo & mom); ofVbo & operator=(const ofVbo& mom); diff --git a/libs/openFrameworks/graphics/ofGraphics.h b/libs/openFrameworks/graphics/ofGraphics.h index f65cc4536d3..16a4924f6b6 100644 --- a/libs/openFrameworks/graphics/ofGraphics.h +++ b/libs/openFrameworks/graphics/ofGraphics.h @@ -9,9 +9,6 @@ namespace glm { typedef vec<3, float, defaultp> vec3; } -class ofVec3f; -class ofVec2f; - template std::string ofToString(const T &); @@ -602,8 +599,8 @@ void ofVertex(const glm::vec3 & p); void ofVertex(const glm::vec2 & p); void ofVertices(const std::vector & polyPoints); void ofVertices(const std::vector & polyPoints); -void ofVertices(const std::vector & polyPoints); -void ofVertices(const std::vector & polyPoints); +//void ofVertices(const std::vector & polyPoints); +//void ofVertices(const std::vector & polyPoints); /// \brief Specifies a single point of a shape. The difference from ofVertex is that /// the line describing the edge of the shape between two points will be a @@ -620,8 +617,8 @@ void ofCurveVertex(const glm::vec2 & p); /// ofPoints. Should be called between ofBeginShape() and ofEndShape(). void ofCurveVertices(const std::vector & curvePoints); void ofCurveVertices(const std::vector & curvePoints); -void ofCurveVertices(const std::vector & curvePoints); -void ofCurveVertices(const std::vector & curvePoints); +//void ofCurveVertices(const std::vector & curvePoints); +//void ofCurveVertices(const std::vector & curvePoints); /// \brief Describes a bezier curve through three points of a shape. To be called /// between ofBeginShape() and ofEndShape(). diff --git a/libs/openFrameworks/video/ofAVFoundationGrabber.mm b/libs/openFrameworks/video/ofAVFoundationGrabber.mm index 9f1257a56ab..5346edd4166 100644 --- a/libs/openFrameworks/video/ofAVFoundationGrabber.mm +++ b/libs/openFrameworks/video/ofAVFoundationGrabber.mm @@ -3,7 +3,6 @@ */ #include "ofAVFoundationGrabber.h" -//#include "ofVectorMath.h" #include "ofRectangle.h" #include "ofGLUtils.h" #include From 47b97664809e57a4583fa339ca59ec0c6d8bad51 Mon Sep 17 00:00:00 2001 From: Dimitre Date: Sun, 3 Nov 2024 00:22:00 -0300 Subject: [PATCH 05/22] update --- libs/openFrameworks/3d/ofNode.cpp | 8 +++++--- libs/openFrameworks/math/ofVectorMath.h | 7 +++++++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/libs/openFrameworks/3d/ofNode.cpp b/libs/openFrameworks/3d/ofNode.cpp index fa98c1cab2e..dd4cbb9e53c 100644 --- a/libs/openFrameworks/3d/ofNode.cpp +++ b/libs/openFrameworks/3d/ofNode.cpp @@ -1,6 +1,6 @@ #define GLM_FORCE_CTOR_INIT #define GLM_ENABLE_EXPERIMENTAL -#define GLM_SWIZZLE +//#define GLM_SWIZZLE //#define GLM_SWIZZLE_XYZW #include "ofNode.h" @@ -638,7 +638,8 @@ void ofNode::orbitDeg(float longitude, float latitude, float radius, const glm:: p = q * p; // rotate p on unit sphere based on quaternion p = p * radius; // scale p by radius from its position on unit sphere - setGlobalPosition(centerPoint + p.xyz()); +// setGlobalPosition(centerPoint + p.xyz()); + setGlobalPosition(centerPoint + p); setOrientation(q); onOrientationChanged(); @@ -661,7 +662,8 @@ void ofNode::orbitRad(float longitude, float latitude, float radius, const glm:: p = q * p; // rotate p on unit sphere based on quaternion p = p * radius; // scale p by radius from its position on unit sphere - setGlobalPosition(centerPoint + p.xyz()); +// setGlobalPosition(centerPoint + p.xyz()); + setGlobalPosition(centerPoint + p); setOrientation(q); onOrientationChanged(); diff --git a/libs/openFrameworks/math/ofVectorMath.h b/libs/openFrameworks/math/ofVectorMath.h index 9d10165eb87..304b01670de 100644 --- a/libs/openFrameworks/math/ofVectorMath.h +++ b/libs/openFrameworks/math/ofVectorMath.h @@ -372,3 +372,10 @@ inline glm::vec2 & operator/=(glm::vec2 & v1, const ofVec2f & v2){ #endif + + +//-------------------------------------------------------------- +inline glm::vec3 & operator+=(glm::vec3 & v1, const glm::vec4 & v2){ + v1 += glm::vec3(v2.x, v2.y, v2.z); + return v1; +} From 22b82670754a13b11a063ca11de6c0a1e6ea025f Mon Sep 17 00:00:00 2001 From: Dimitre Date: Sun, 3 Nov 2024 00:50:47 -0300 Subject: [PATCH 06/22] up --- libs/openFrameworks/math/ofVectorMath.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libs/openFrameworks/math/ofVectorMath.h b/libs/openFrameworks/math/ofVectorMath.h index 304b01670de..a2cead0b7bd 100644 --- a/libs/openFrameworks/math/ofVectorMath.h +++ b/libs/openFrameworks/math/ofVectorMath.h @@ -375,7 +375,6 @@ inline glm::vec2 & operator/=(glm::vec2 & v1, const ofVec2f & v2){ //-------------------------------------------------------------- -inline glm::vec3 & operator+=(glm::vec3 & v1, const glm::vec4 & v2){ - v1 += glm::vec3(v2.x, v2.y, v2.z); - return v1; +inline glm::vec3 operator+(const glm::vec3 & v1, const glm::vec4 & v2){ + return v1 + glm::vec3(v2.x, v2.y, v2.z); } From 7feb017a7c0f97ec51a405284ef558d3e2b649a0 Mon Sep 17 00:00:00 2001 From: Dimitre Date: Sun, 3 Nov 2024 01:05:13 -0300 Subject: [PATCH 07/22] gui --- addons/ofxGui/src/ofxGuiGroup.cpp | 38 ++++++++++++++-------------- addons/ofxGui/src/ofxGuiGroup.h | 6 ++--- addons/ofxGui/src/ofxSliderGroup.cpp | 30 +++++++++++----------- addons/ofxOpenCv/src/ofxCvImage.cpp | 6 ++--- addons/ofxOpenCv/src/ofxCvImage.h | 8 +++--- 5 files changed, 43 insertions(+), 45 deletions(-) diff --git a/addons/ofxGui/src/ofxGuiGroup.cpp b/addons/ofxGui/src/ofxGuiGroup.cpp index b2eed036405..4476f1cafa5 100644 --- a/addons/ofxGui/src/ofxGuiGroup.cpp +++ b/addons/ofxGui/src/ofxGuiGroup.cpp @@ -83,15 +83,15 @@ ofxGuiGroup * ofxGuiGroup::setup(const ofParameterGroup & _parameters, const str }else if(type == typeid(ofParameter ).name()){ auto p = _parameters.getVoid(i); add(p); - }else if(type == typeid(ofParameter ).name()){ - auto p = _parameters.get(i); - add(p); - }else if(type == typeid(ofParameter ).name()){ - auto p = _parameters.get(i); - add(p); - }else if(type == typeid(ofParameter ).name()){ - auto p = _parameters.get(i); - add(p); + // }else if(type == typeid(ofParameter ).name()){ + // auto p = _parameters.get(i); + // add(p); + // }else if(type == typeid(ofParameter ).name()){ + // auto p = _parameters.get(i); + // add(p); + // }else if(type == typeid(ofParameter ).name()){ + // auto p = _parameters.get(i); + // add(p); }else if(type == typeid(ofParameter ).name()){ auto p = _parameters.get(i); add(p); @@ -173,17 +173,17 @@ void ofxGuiGroup::add(ofParameter & parameter){ add(createGuiElement >(parameter)); } -void ofxGuiGroup::add(ofParameter & parameter){ - add(createGuiElement >(parameter)); -} +// void ofxGuiGroup::add(ofParameter & parameter){ +// add(createGuiElement >(parameter)); +// } -void ofxGuiGroup::add(ofParameter & parameter){ - add(createGuiElement >(parameter)); -} +// void ofxGuiGroup::add(ofParameter & parameter){ +// add(createGuiElement >(parameter)); +// } -void ofxGuiGroup::add(ofParameter & parameter){ - add(createGuiElement >(parameter)); -} +// void ofxGuiGroup::add(ofParameter & parameter){ +// add(createGuiElement >(parameter)); +// } void ofxGuiGroup::add(ofParameter & parameter){ add(createGuiElement >(parameter)); @@ -279,7 +279,7 @@ bool ofxGuiGroup::mouseReleased(ofMouseEventArgs & args){ return true; } } - if(b.inside(ofPoint(args.x, args.y))){ + if(b.inside({args.x, args.y})){ return true; }else{ return false; diff --git a/addons/ofxGui/src/ofxGuiGroup.h b/addons/ofxGui/src/ofxGuiGroup.h index 298ddb42a27..8c269ca0a61 100644 --- a/addons/ofxGui/src/ofxGuiGroup.h +++ b/addons/ofxGui/src/ofxGuiGroup.h @@ -32,9 +32,9 @@ class ofxGuiGroup : public ofxBaseGui { ownedCollection.emplace_back(std::make_unique(parameter)); add(ownedCollection.back().get()); } - void add(ofParameter & parameter); - void add(ofParameter & parameter); - void add(ofParameter & parameter); + // void add(ofParameter & parameter); + // void add(ofParameter & parameter); + // void add(ofParameter & parameter); void add(ofParameter & parameter); void add(ofParameter & parameter); void add(ofParameter & parameter); diff --git a/addons/ofxGui/src/ofxSliderGroup.cpp b/addons/ofxGui/src/ofxSliderGroup.cpp index ed8d8927f77..5d68af1975f 100644 --- a/addons/ofxGui/src/ofxSliderGroup.cpp +++ b/addons/ofxGui/src/ofxSliderGroup.cpp @@ -74,20 +74,20 @@ size_t ofxVecSlider_::dim(){ return 4; } -template<> -size_t ofxVecSlider_::dim(){ - return 2; -} +// template<> +// size_t ofxVecSlider_::dim(){ +// return 2; +// } -template<> -size_t ofxVecSlider_::dim(){ - return 3; -} +// template<> +// size_t ofxVecSlider_::dim(){ +// return 3; +// } -template<> -size_t ofxVecSlider_::dim(){ - return 4; -} +// template<> +// size_t ofxVecSlider_::dim(){ +// return 4; +// } template ofAbstractParameter & ofxVecSlider_::getParameter(){ @@ -110,9 +110,9 @@ const VecType * ofxVecSlider_::operator->(){ return &value.get(); } -template class ofxVecSlider_; -template class ofxVecSlider_; -template class ofxVecSlider_; +// template class ofxVecSlider_; +// template class ofxVecSlider_; +// template class ofxVecSlider_; template class ofxVecSlider_; template class ofxVecSlider_; template class ofxVecSlider_; diff --git a/addons/ofxOpenCv/src/ofxCvImage.cpp b/addons/ofxOpenCv/src/ofxCvImage.cpp index 536fe6fdfb4..89b5c986497 100644 --- a/addons/ofxOpenCv/src/ofxCvImage.cpp +++ b/addons/ofxOpenCv/src/ofxCvImage.cpp @@ -7,8 +7,6 @@ #include "ofConstants.h" - - //-------------------------------------------------------------------------------- ofxCvImage::ofxCvImage() { width = 0; @@ -688,7 +686,7 @@ void ofxCvImage::remap( IplImage* mapX, IplImage* mapY ) { */ //-------------------------------------------------------------------------------- -void ofxCvImage::warpPerspective( const ofPoint& A, const ofPoint& B, const ofPoint& C, const ofPoint& D ) { +void ofxCvImage::warpPerspective( const glm::vec2 & A, const glm::vec2 & B, const glm::vec2 & C, const glm::vec2 & D ) { if( !bAllocated ){ ofLogError("ofxCvImage") << "warpPerspective(): image not allocated"; return; @@ -727,7 +725,7 @@ void ofxCvImage::warpPerspective( const ofPoint& A, const ofPoint& B, const ofPo //-------------------------------------------------------------------------------- -void ofxCvImage::warpIntoMe( ofxCvImage& mom, const ofPoint src[4], const ofPoint dst[4] ){ +void ofxCvImage::warpIntoMe( ofxCvImage& mom, const glm::vec2 src[4], const glm::vec2 dst[4] ){ if( !bAllocated ){ ofLogError("ofxCvImage") << "warpIntoMe(): image not allocated"; diff --git a/addons/ofxOpenCv/src/ofxCvImage.h b/addons/ofxOpenCv/src/ofxCvImage.h index 6b7b64dd02d..85711793379 100644 --- a/addons/ofxOpenCv/src/ofxCvImage.h +++ b/addons/ofxOpenCv/src/ofxCvImage.h @@ -140,10 +140,10 @@ class ofxCvImage : public ofBaseImage { virtual void remap( IplImage* mapX, IplImage* mapY ); - virtual void warpPerspective( const ofPoint& A, const ofPoint& B, - const ofPoint& C, const ofPoint& D ); + virtual void warpPerspective( const glm::vec2 & A, const glm::vec2 & B, + const glm::vec2 & C, const glm::vec2 & D ); virtual void warpIntoMe( ofxCvImage& mom, - const ofPoint src[4], const ofPoint dst[4] ); + const glm::vec2 src[4], const glm::vec2 dst[4] ); @@ -188,7 +188,7 @@ class ofxCvImage : public ofBaseImage { mutable bool bTextureDirty; // texture needs to be reloaded before drawing bool bUseTexture; - ofPoint anchor; + glm::vec2 anchor; bool bAnchorIsPct; }; From 90b7d229f2c1d2ad07aea8e08981153a84cb4d75 Mon Sep 17 00:00:00 2001 From: Dimitre Date: Sun, 3 Nov 2024 01:22:17 -0300 Subject: [PATCH 08/22] ofxOpenCv --- addons/ofxOpenCv/src/ofxCvColorImage.h | 6 +++--- addons/ofxOpenCv/src/ofxCvContourFinder.cpp | 2 +- addons/ofxOpenCv/src/ofxCvContourFinder.h | 2 +- addons/ofxOpenCv/src/ofxCvGrayscaleImage.h | 6 +++--- addons/ofxOpenCv/src/ofxCvHaarFinder.cpp | 16 ++++++++-------- addons/ofxOpenCv/src/ofxCvShortImage.h | 6 +++--- 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/addons/ofxOpenCv/src/ofxCvColorImage.h b/addons/ofxOpenCv/src/ofxCvColorImage.h index 6426ae47e0c..3ecb5fb162a 100644 --- a/addons/ofxOpenCv/src/ofxCvColorImage.h +++ b/addons/ofxOpenCv/src/ofxCvColorImage.h @@ -116,10 +116,10 @@ class ofxCvColorImage : public ofxCvImage { // float focalX, float focalY, // float centerX, float centerY ); //in base class // virtual void remap( IplImage* mapX, IplImage* mapY ); //in base class - // virtual void warpPerspective( ofPoint& A, ofPoint& B, - // ofPoint& C, ofPoint& D ); //in base class + // virtual void warpPerspective( glm::vec2 & A, glm::vec2 & B, + // glm::vec2 & C, glm::vec2 & D ); //in base class // virtual void warpIntoMe( ofxCvImage& mom, - // ofPoint src[4], ofPoint dst[4] ); //in base class + // glm::vec2 src[4], glm::vec2 dst[4] ); //in base class // Other Image Operations diff --git a/addons/ofxOpenCv/src/ofxCvContourFinder.cpp b/addons/ofxOpenCv/src/ofxCvContourFinder.cpp index 4386ed4c0b7..d7ba1eb8a23 100644 --- a/addons/ofxOpenCv/src/ofxCvContourFinder.cpp +++ b/addons/ofxOpenCv/src/ofxCvContourFinder.cpp @@ -130,7 +130,7 @@ int ofxCvContourFinder::findContours( ofxCvGrayscaleImage& input, for( int j=0; j < cvSeqBlobs[i]->total; j++ ) { CV_READ_SEQ_ELEM( pt, reader ); - blobs[i].pts.push_back( ofPoint((float)pt.x, (float)pt.y) ); + blobs[i].pts.push_back( glm::vec2((float)pt.x, (float)pt.y) ); } blobs[i].nPts = blobs[i].pts.size(); diff --git a/addons/ofxOpenCv/src/ofxCvContourFinder.h b/addons/ofxOpenCv/src/ofxCvContourFinder.h index 3c8852824d5..173867134fe 100644 --- a/addons/ofxOpenCv/src/ofxCvContourFinder.h +++ b/addons/ofxOpenCv/src/ofxCvContourFinder.h @@ -58,7 +58,7 @@ class ofxCvContourFinder : public ofBaseDraws { CvMoments* myMoments; std::vector cvSeqBlobs; //these will become blobs - ofPoint anchor; + glm::vec2 anchor; bool bAnchorIsPct; virtual void reset(); diff --git a/addons/ofxOpenCv/src/ofxCvGrayscaleImage.h b/addons/ofxOpenCv/src/ofxCvGrayscaleImage.h index 7dc0ffce4be..d70b8fde19d 100644 --- a/addons/ofxOpenCv/src/ofxCvGrayscaleImage.h +++ b/addons/ofxOpenCv/src/ofxCvGrayscaleImage.h @@ -117,10 +117,10 @@ class ofxCvGrayscaleImage : public ofxCvImage { // float focalX, float focalY, // float centerX, float centerY ); //in base class // virtual void remap( IplImage* mapX, IplImage* mapY ); //in base class - // virtual void warpPerspective( ofPoint& A, ofPoint& B, - // ofPoint& C, ofPoint& D ); //in base class + // virtual void warpPerspective( glm::vec2& A, glm::vec2& B, + // glm::vec2& C, glm::vec2& D ); //in base class // virtual void warpIntoMe( ofxCvImage& mom, - // ofPoint src[4], ofPoint dst[4] ); //in base class + // glm::vec2 src[4], glm::vec2 dst[4] ); //in base class // Other Image Operations diff --git a/addons/ofxOpenCv/src/ofxCvHaarFinder.cpp b/addons/ofxOpenCv/src/ofxCvHaarFinder.cpp index 839c8dca6cd..2832e2da32a 100644 --- a/addons/ofxOpenCv/src/ofxCvHaarFinder.cpp +++ b/addons/ofxOpenCv/src/ofxCvHaarFinder.cpp @@ -237,10 +237,10 @@ int ofxCvHaarFinder::findHaarObjects(const ofxCvGrayscaleImage& input, blob.boundingRect.height = r->height; blob.centroid.x = centerx; blob.centroid.y = centery; - blob.pts.push_back(ofPoint(r->x, r->y)); - blob.pts.push_back(ofPoint(r->x + r->width, r->y)); - blob.pts.push_back(ofPoint(r->x + r->width, r->y + r->height)); - blob.pts.push_back(ofPoint(r->x, r->y + r->height)); + blob.pts.push_back(glm::vec2(r->x, r->y)); + blob.pts.push_back(glm::vec2(r->x + r->width, r->y)); + blob.pts.push_back(glm::vec2(r->x + r->width, r->y + r->height)); + blob.pts.push_back(glm::vec2(r->x, r->y + r->height)); blobs.push_back(blob); } @@ -322,10 +322,10 @@ int ofxCvHaarFinder::findHaarObjects(const ofxCvGrayscaleImage& input, blob.boundingRect.height = r.height; blob.centroid.x = centerx; blob.centroid.y = centery; - blob.pts.push_back(ofPoint(r.x, r.y)); - blob.pts.push_back(ofPoint(r.x + r.width, r.y)); - blob.pts.push_back(ofPoint(r.x + r.width, r.y + r.height)); - blob.pts.push_back(ofPoint(r.x, r.y + r.height)); + blob.pts.push_back(glm::vec2(r.x, r.y)); + blob.pts.push_back(glm::vec2(r.x + r.width, r.y)); + blob.pts.push_back(glm::vec2(r.x + r.width, r.y + r.height)); + blob.pts.push_back(glm::vec2(r.x, r.y + r.height)); blobs.push_back(blob); } diff --git a/addons/ofxOpenCv/src/ofxCvShortImage.h b/addons/ofxOpenCv/src/ofxCvShortImage.h index 22fee5a8c19..b079be22e5a 100644 --- a/addons/ofxOpenCv/src/ofxCvShortImage.h +++ b/addons/ofxOpenCv/src/ofxCvShortImage.h @@ -107,10 +107,10 @@ class ofxCvShortImage : public ofxCvImage { // float focalX, float focalY, // float centerX, float centerY ); //in base class // virtual void remap( IplImage* mapX, IplImage* mapY ); //in base class - // virtual void warpPerspective( ofPoint& A, ofPoint& B, - // ofPoint& C, ofPoint& D ); //in base class + // virtual void warpPerspective( glm::vec2& A, glm::vec2& B, + // glm::vec2& C, glm::vec2& D ); //in base class // virtual void warpIntoMe( ofxCvImage& mom, - // ofPoint src[4], ofPoint dst[4] ); //in base class + // glm::vec2 src[4], glm::vec2 dst[4] ); //in base class // Other Image Operations From 0d72653f06466ebccb0b8231f197173012b71ceb Mon Sep 17 00:00:00 2001 From: Dimitre Date: Sun, 3 Nov 2024 01:26:25 -0300 Subject: [PATCH 09/22] ofxKinect --- addons/ofxKinect/src/ofxKinect.cpp | 18 +- addons/ofxKinect/src/ofxKinect.h | 16 +- .../project.pbxproj | 938 ++++-------------- 3 files changed, 207 insertions(+), 765 deletions(-) diff --git a/addons/ofxKinect/src/ofxKinect.cpp b/addons/ofxKinect/src/ofxKinect.cpp index 6ddae111a8e..c564a914852 100644 --- a/addons/ofxKinect/src/ofxKinect.cpp +++ b/addons/ofxKinect/src/ofxKinect.cpp @@ -423,20 +423,20 @@ float ofxKinect::getDistanceAt(int x, int y) const{ } //------------------------------------ -float ofxKinect::getDistanceAt(const ofPoint & p) const{ +float ofxKinect::getDistanceAt(const glm::vec2 & p) const{ return getDistanceAt(p.x, p.y); } //------------------------------------ -ofVec3f ofxKinect::getWorldCoordinateAt(int x, int y) const{ +glm::vec3 ofxKinect::getWorldCoordinateAt(int x, int y) const{ return getWorldCoordinateAt(x, y, getDistanceAt(x, y)); } //------------------------------------ -ofVec3f ofxKinect::getWorldCoordinateAt(float cx, float cy, float wz) const{ +glm::vec3 ofxKinect::getWorldCoordinateAt(float cx, float cy, float wz) const{ double wx, wy; freenect_camera_to_world(kinectDevice, cx, cy, wz, &wx, &wy); - return ofVec3f(wx, wy, wz); + return glm::vec3(wx, wy, wz); } //------------------------------------ @@ -472,7 +472,7 @@ ofColor ofxKinect::getColorAt(int x, int y) const{ } //------------------------------------ -ofColor ofxKinect::getColorAt(const ofPoint & p) const{ +ofColor ofxKinect::getColorAt(const glm::vec2 & p) const{ return getColorAt(p.x, p.y); } @@ -602,12 +602,12 @@ bool ofxKinect::hasLedControl() const{ } //--------------------------------------------------------------------------- -ofPoint ofxKinect::getRawAccel() const{ +glm::vec3 ofxKinect::getRawAccel() const{ return rawAccel; } //--------------------------------------------------------------------------- -ofPoint ofxKinect::getMksAccel() const{ +glm::vec3 ofxKinect::getMksAccel() const{ return mksAccel; } @@ -677,7 +677,7 @@ void ofxKinect::draw(float _x, float _y) const{ } //---------------------------------------------------------- -void ofxKinect::draw(const ofPoint & point) const{ +void ofxKinect::draw(const glm::vec2 & point) const{ draw(point.x, point.y); } @@ -699,7 +699,7 @@ void ofxKinect::drawDepth(float _x, float _y) const{ } //---------------------------------------------------------- -void ofxKinect::drawDepth(const ofPoint & point) const{ +void ofxKinect::drawDepth(const glm::vec2 & point) const{ drawDepth(point.x, point.y); } diff --git a/addons/ofxKinect/src/ofxKinect.h b/addons/ofxKinect/src/ofxKinect.h index 08ea482d0dc..23cc9f6cd10 100644 --- a/addons/ofxKinect/src/ofxKinect.h +++ b/addons/ofxKinect/src/ofxKinect.h @@ -121,7 +121,7 @@ class ofxKinect : public ofxBase3DVideo, protected ofThread { /// get the calulated distance for a depth point float getDistanceAt(int x, int y) const; - float getDistanceAt(const ofPoint & p) const; + float getDistanceAt(const glm::vec2 & p) const; /// calculates the coordinate in the world for the depth point (perspective calculation) /// @@ -154,7 +154,7 @@ class ofxKinect : public ofxBase3DVideo, protected ofThread { /// /// see setRegistration() for calibrated depth->RGB points ofColor getColorAt(int x, int y) const; - ofColor getColorAt(const ofPoint & p) const; + ofColor getColorAt(const glm::vec2 & p) const; /// \section Pixel Data @@ -226,7 +226,7 @@ class ofxKinect : public ofxBase3DVideo, protected ofThread { /// ... yes, the kinect has an accelerometer /// raw axis values - ofPoint getRawAccel() const; + glm::vec3 getRawAccel() const; /// axis-based gravity adjusted accelerometer values /// @@ -236,7 +236,7 @@ class ofxKinect : public ofxBase3DVideo, protected ofThread { /// /// http://www.kionix.com/Product%20Sheets/KXSD9%20Product%20Brief.pdf /// - ofPoint getMksAccel() const; + glm::vec3 getMksAccel() const; /// get the current pitch (x axis) & roll (z axis) of the kinect in degrees /// @@ -282,13 +282,13 @@ class ofxKinect : public ofxBase3DVideo, protected ofThread { /// draw the video texture void draw(float x, float y, float w, float h) const; void draw(float x, float y) const; - void draw(const ofPoint& point) const; + void draw(const glm::vec2& point) const; void draw(const ofRectangle& rect) const; /// draw the grayscale depth texture void drawDepth(float x, float y, float w, float h) const; void drawDepth(float x, float y) const; - void drawDepth(const ofPoint& point) const; + void drawDepth(const glm::vec2& point) const; void drawDepth(const ofRectangle& rect) const; /// \section Util @@ -354,8 +354,8 @@ class ofxKinect : public ofxBase3DVideo, protected ofThread { ofShortPixels depthPixelsRaw; ofFloatPixels distancePixels; - ofPoint rawAccel; - ofPoint mksAccel; + glm::vec3 rawAccel; + glm::vec3 mksAccel; float targetTiltAngleDeg; float currentTiltAngleDeg; diff --git a/libs/openFrameworksCompiled/project/osx/openFrameworksLib.xcodeproj/project.pbxproj b/libs/openFrameworksCompiled/project/osx/openFrameworksLib.xcodeproj/project.pbxproj index 476b3613711..d0bbdb66ddf 100644 --- a/libs/openFrameworksCompiled/project/osx/openFrameworksLib.xcodeproj/project.pbxproj +++ b/libs/openFrameworksCompiled/project/osx/openFrameworksLib.xcodeproj/project.pbxproj @@ -3,625 +3,164 @@ archiveVersion = 1; classes = { }; - objectVersion = 46; + objectVersion = 70; objects = { /* Begin PBXBuildFile section */ - 19662F2E2834A44400B622ED /* ofGraphicsCairo.h in Headers */ = {isa = PBXBuildFile; fileRef = 19662F2C2834A44400B622ED /* ofGraphicsCairo.h */; }; - 19662F2F2834A44400B622ED /* ofGraphicsCairo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 19662F2D2834A44400B622ED /* ofGraphicsCairo.cpp */; }; - 22246D93176C9987008A8AF4 /* ofGLProgrammableRenderer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 22246D91176C9987008A8AF4 /* ofGLProgrammableRenderer.cpp */; }; - 22246D94176C9987008A8AF4 /* ofGLProgrammableRenderer.h in Headers */ = {isa = PBXBuildFile; fileRef = 22246D92176C9987008A8AF4 /* ofGLProgrammableRenderer.h */; }; - 22769591170D9DD200604FC3 /* ofMatrixStack.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2276958F170D9DD200604FC3 /* ofMatrixStack.cpp */; }; - 22769592170D9DD200604FC3 /* ofMatrixStack.h in Headers */ = {isa = PBXBuildFile; fileRef = 22769590170D9DD200604FC3 /* ofMatrixStack.h */; }; - 2292E73E19E3049700DE9411 /* ofBufferObject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2292E73C19E3049700DE9411 /* ofBufferObject.cpp */; }; - 2292E73F19E3049700DE9411 /* ofBufferObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 2292E73D19E3049700DE9411 /* ofBufferObject.h */; }; - 229EB9A61B3181C800FF7B5F /* ofEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 229EB9A51B3181C800FF7B5F /* ofEvent.h */; }; - 22A1C453170AFCB60079E473 /* ofRendererCollection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 22A1C452170AFCB60079E473 /* ofRendererCollection.cpp */; }; - 22FAD01E17049373002A7EB3 /* ofAppGLFWWindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 22FAD01C17049373002A7EB3 /* ofAppGLFWWindow.cpp */; }; - 22FAD01F17049373002A7EB3 /* ofAppGLFWWindow.h in Headers */ = {isa = PBXBuildFile; fileRef = 22FAD01D17049373002A7EB3 /* ofAppGLFWWindow.h */; }; - 27DEA3111796F578000A9E90 /* ofXml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 27DEA30F1796F578000A9E90 /* ofXml.cpp */; }; - 27DEA3121796F578000A9E90 /* ofXml.h in Headers */ = {isa = PBXBuildFile; fileRef = 27DEA3101796F578000A9E90 /* ofXml.h */; }; - 2E498914292C96340096EC56 /* ofCubeMap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E498911292C96340096EC56 /* ofCubeMap.cpp */; }; - 2E498915292C96340096EC56 /* ofCubeMapShaders.h in Headers */ = {isa = PBXBuildFile; fileRef = 2E498912292C96340096EC56 /* ofCubeMapShaders.h */; }; - 2E498916292C96340096EC56 /* ofCubeMap.h in Headers */ = {isa = PBXBuildFile; fileRef = 2E498913292C96340096EC56 /* ofCubeMap.h */; }; - 2E4D30C128F5BA9C0074D450 /* ofShadow.h in Headers */ = {isa = PBXBuildFile; fileRef = 2E4D30BF28F5BA9C0074D450 /* ofShadow.h */; }; - 2E4D30C228F5BA9C0074D450 /* ofShadow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E4D30C028F5BA9C0074D450 /* ofShadow.cpp */; }; - 2E6EA7011603A9E400B7ADF3 /* of3dGraphics.h in Headers */ = {isa = PBXBuildFile; fileRef = 2E6EA7001603A9E400B7ADF3 /* of3dGraphics.h */; }; - 2E6EA7041603AA7A00B7ADF3 /* of3dGraphics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E6EA7031603AA7A00B7ADF3 /* of3dGraphics.cpp */; }; - 2E6EA7061603AABD00B7ADF3 /* of3dPrimitives.h in Headers */ = {isa = PBXBuildFile; fileRef = 2E6EA7051603AABD00B7ADF3 /* of3dPrimitives.h */; }; - 2E6EA7081603AAD600B7ADF3 /* of3dPrimitives.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E6EA7071603AAD600B7ADF3 /* of3dPrimitives.cpp */; }; - 30CC5385207A36FD008234AF /* ofMathConstants.h in Headers */ = {isa = PBXBuildFile; fileRef = 30CC5384207A36FD008234AF /* ofMathConstants.h */; }; - 53EEEF4B130766EF0027C199 /* ofMesh.h in Headers */ = {isa = PBXBuildFile; fileRef = 53EEEF49130766EF0027C199 /* ofMesh.h */; }; - 6678E96F19FEAFA900C00581 /* ofSoundBuffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6678E96D19FEAFA900C00581 /* ofSoundBuffer.cpp */; }; - 6678E97019FEAFA900C00581 /* ofSoundBuffer.h in Headers */ = {isa = PBXBuildFile; fileRef = 6678E96E19FEAFA900C00581 /* ofSoundBuffer.h */; }; - 6678E97F19FEB5A600C00581 /* ofSoundUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 6678E97C19FEB5A600C00581 /* ofSoundUtils.h */; }; - 676672A31A749D1900400051 /* ofAVFoundationVideoPlayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 6766729D1A749D1900400051 /* ofAVFoundationVideoPlayer.m */; }; - 676672A41A749D1900400051 /* ofAVFoundationPlayer.h in Headers */ = {isa = PBXBuildFile; fileRef = 6766729E1A749D1900400051 /* ofAVFoundationPlayer.h */; }; - 676672A51A749D1900400051 /* ofAVFoundationVideoPlayer.h in Headers */ = {isa = PBXBuildFile; fileRef = 6766729F1A749D1900400051 /* ofAVFoundationVideoPlayer.h */; }; - 676672A81A749D1900400051 /* ofAVFoundationPlayer.mm in Sources */ = {isa = PBXBuildFile; fileRef = 676672A21A749D1900400051 /* ofAVFoundationPlayer.mm */; }; - 67D96B971651AF6D00D5242D /* ofGLUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 67D96B941651AF6D00D5242D /* ofGLUtils.cpp */; }; - 692C298B19DC5C5500C27C5D /* ofFpsCounter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 692C298719DC5C5500C27C5D /* ofFpsCounter.cpp */; }; - 692C298C19DC5C5500C27C5D /* ofFpsCounter.h in Headers */ = {isa = PBXBuildFile; fileRef = 692C298819DC5C5500C27C5D /* ofFpsCounter.h */; }; - 692C298D19DC5C5500C27C5D /* ofTimer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 692C298919DC5C5500C27C5D /* ofTimer.cpp */; }; - 692C298E19DC5C5500C27C5D /* ofTimer.h in Headers */ = {isa = PBXBuildFile; fileRef = 692C298A19DC5C5500C27C5D /* ofTimer.h */; }; - 694425161FE4544C00770088 /* ofGLBaseTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = 694425151FE4544C00770088 /* ofGLBaseTypes.h */; }; - 6944251A1FE4547400770088 /* ofGraphicsBaseTypes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 694425171FE4547400770088 /* ofGraphicsBaseTypes.cpp */; }; - 6944251B1FE4547400770088 /* ofGraphicsBaseTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = 694425181FE4547400770088 /* ofGraphicsBaseTypes.h */; }; - 6944251C1FE4547400770088 /* ofGraphicsConstants.h in Headers */ = {isa = PBXBuildFile; fileRef = 694425191FE4547400770088 /* ofGraphicsConstants.h */; }; - 6944251F1FE4548B00770088 /* ofSoundBaseTypes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6944251D1FE4548B00770088 /* ofSoundBaseTypes.cpp */; }; - 694425201FE4548B00770088 /* ofSoundBaseTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = 6944251E1FE4548B00770088 /* ofSoundBaseTypes.h */; }; - 694425221FE456AF00770088 /* ofVideoBaseTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = 694425211FE456AF00770088 /* ofVideoBaseTypes.h */; }; - 772BDF73146928600030F0EE /* ofOpenALSoundPlayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 772BDF71146928600030F0EE /* ofOpenALSoundPlayer.cpp */; }; - 772BDF74146928600030F0EE /* ofOpenALSoundPlayer.h in Headers */ = {isa = PBXBuildFile; fileRef = 772BDF72146928600030F0EE /* ofOpenALSoundPlayer.h */; }; - 92C55F88132DA7DD00EC2631 /* ofPath.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 92C55F86132DA7DD00EC2631 /* ofPath.cpp */; }; - 92C55F89132DA7DD00EC2631 /* ofPath.h in Headers */ = {isa = PBXBuildFile; fileRef = 92C55F87132DA7DD00EC2631 /* ofPath.h */; }; - 9979E8221A1CCC44007E55D1 /* ofWindowSettings.h in Headers */ = {isa = PBXBuildFile; fileRef = 9979E81F1A1CCC44007E55D1 /* ofWindowSettings.h */; }; - 9979E8231A1CCC44007E55D1 /* ofMainLoop.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9979E8201A1CCC44007E55D1 /* ofMainLoop.cpp */; }; - 9979E8241A1CCC44007E55D1 /* ofMainLoop.h in Headers */ = {isa = PBXBuildFile; fileRef = 9979E8211A1CCC44007E55D1 /* ofMainLoop.h */; }; - BBA81C431FFBE4DB0064EA94 /* ofBaseApp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BBA81C421FFBE4DB0064EA94 /* ofBaseApp.cpp */; }; - DA48FE78131D85A6000062BC /* ofPolyline.h in Headers */ = {isa = PBXBuildFile; fileRef = DA48FE74131D85A6000062BC /* ofPolyline.h */; }; - DA94C2F01301D32200CCC773 /* ofRendererCollection.h in Headers */ = {isa = PBXBuildFile; fileRef = DA94C2ED1301D32200CCC773 /* ofRendererCollection.h */; }; - DA97FD3C12F5A61A005C9991 /* ofCairoRenderer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DA97FD3612F5A61A005C9991 /* ofCairoRenderer.cpp */; }; - DA97FD3D12F5A61A005C9991 /* ofCairoRenderer.h in Headers */ = {isa = PBXBuildFile; fileRef = DA97FD3712F5A61A005C9991 /* ofCairoRenderer.h */; }; - DAC22D3F16E7A4AF0020226D /* ofParameter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DAC22D3B16E7A4AF0020226D /* ofParameter.cpp */; }; - DAC22D4016E7A4AF0020226D /* ofParameter.h in Headers */ = {isa = PBXBuildFile; fileRef = DAC22D3C16E7A4AF0020226D /* ofParameter.h */; }; - DAC22D4116E7A4AF0020226D /* ofParameterGroup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DAC22D3D16E7A4AF0020226D /* ofParameterGroup.cpp */; }; - DAC22D4216E7A4AF0020226D /* ofParameterGroup.h in Headers */ = {isa = PBXBuildFile; fileRef = DAC22D3E16E7A4AF0020226D /* ofParameterGroup.h */; }; - DACFA8DA132D09E8008D4B7A /* ofFbo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DACFA8C9132D09E8008D4B7A /* ofFbo.cpp */; }; - DACFA8DB132D09E8008D4B7A /* ofFbo.h in Headers */ = {isa = PBXBuildFile; fileRef = DACFA8CA132D09E8008D4B7A /* ofFbo.h */; }; - DACFA8DC132D09E8008D4B7A /* ofGLRenderer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DACFA8CB132D09E8008D4B7A /* ofGLRenderer.cpp */; }; - DACFA8DD132D09E8008D4B7A /* ofGLRenderer.h in Headers */ = {isa = PBXBuildFile; fileRef = DACFA8CC132D09E8008D4B7A /* ofGLRenderer.h */; }; - DACFA8DE132D09E8008D4B7A /* ofGLUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = DACFA8CD132D09E8008D4B7A /* ofGLUtils.h */; }; - DACFA8DF132D09E8008D4B7A /* ofLight.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DACFA8CE132D09E8008D4B7A /* ofLight.cpp */; }; - DACFA8E0132D09E8008D4B7A /* ofLight.h in Headers */ = {isa = PBXBuildFile; fileRef = DACFA8CF132D09E8008D4B7A /* ofLight.h */; }; - DACFA8E1132D09E8008D4B7A /* ofMaterial.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DACFA8D0132D09E8008D4B7A /* ofMaterial.cpp */; }; - DACFA8E2132D09E8008D4B7A /* ofMaterial.h in Headers */ = {isa = PBXBuildFile; fileRef = DACFA8D1132D09E8008D4B7A /* ofMaterial.h */; }; - DACFA8E3132D09E8008D4B7A /* ofShader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DACFA8D2132D09E8008D4B7A /* ofShader.cpp */; }; - DACFA8E4132D09E8008D4B7A /* ofShader.h in Headers */ = {isa = PBXBuildFile; fileRef = DACFA8D3132D09E8008D4B7A /* ofShader.h */; }; - DACFA8E5132D09E8008D4B7A /* ofTexture.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DACFA8D4132D09E8008D4B7A /* ofTexture.cpp */; }; - DACFA8E6132D09E8008D4B7A /* ofTexture.h in Headers */ = {isa = PBXBuildFile; fileRef = DACFA8D5132D09E8008D4B7A /* ofTexture.h */; }; - DACFA8E7132D09E8008D4B7A /* ofVbo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DACFA8D6132D09E8008D4B7A /* ofVbo.cpp */; }; - DACFA8E8132D09E8008D4B7A /* ofVbo.h in Headers */ = {isa = PBXBuildFile; fileRef = DACFA8D7132D09E8008D4B7A /* ofVbo.h */; }; - DACFA8E9132D09E8008D4B7A /* ofVboMesh.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DACFA8D8132D09E8008D4B7A /* ofVboMesh.cpp */; }; - DACFA8EA132D09E8008D4B7A /* ofVboMesh.h in Headers */ = {isa = PBXBuildFile; fileRef = DACFA8D9132D09E8008D4B7A /* ofVboMesh.h */; }; - E486629A1D8C61B000D1735C /* ofAVFoundationGrabber.h in Headers */ = {isa = PBXBuildFile; fileRef = E48662981D8C61B000D1735C /* ofAVFoundationGrabber.h */; }; - E486629B1D8C61B000D1735C /* ofAVFoundationGrabber.mm in Sources */ = {isa = PBXBuildFile; fileRef = E48662991D8C61B000D1735C /* ofAVFoundationGrabber.mm */; }; - E495DF7D178896A900994238 /* ofAppNoWindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E495DF7B178896A900994238 /* ofAppNoWindow.cpp */; }; - E495DF7E178896A900994238 /* ofAppNoWindow.h in Headers */ = {isa = PBXBuildFile; fileRef = E495DF7C178896A900994238 /* ofAppNoWindow.h */; }; - E4998A26128A39480094AC3F /* ofEvents.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4998A25128A39480094AC3F /* ofEvents.cpp */; }; - E4B27C1910CBEB9D00536013 /* ofAppRunner.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4B27AAF10CBE92A00536013 /* ofAppRunner.cpp */; }; - E4B27C1A10CBEB9D00536013 /* ofArduino.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4B27AB310CBE92A00536013 /* ofArduino.cpp */; }; - E4B27C1B10CBEB9D00536013 /* ofSerial.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4B27AB510CBE92A00536013 /* ofSerial.cpp */; }; - E4B27C2610CBEB9D00536013 /* ofVideoGrabber.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4B27ADB10CBE92A00536013 /* ofVideoGrabber.cpp */; }; - E4B27C2710CBEB9D00536013 /* ofVideoPlayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4B27ADD10CBE92A00536013 /* ofVideoPlayer.cpp */; }; - E4C5E387131AC1B10050F992 /* ofRtAudioSoundStream.h in Headers */ = {isa = PBXBuildFile; fileRef = E4C5E385131AC1B10050F992 /* ofRtAudioSoundStream.h */; }; - E4C5E388131AC1B10050F992 /* ofRtAudioSoundStream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4C5E386131AC1B10050F992 /* ofRtAudioSoundStream.cpp */; }; - E4F3BA6712F4C4BF002D19BB /* of3dUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4F3BA5312F4C4BF002D19BB /* of3dUtils.cpp */; }; - E4F3BA6812F4C4BF002D19BB /* of3dUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = E4F3BA5412F4C4BF002D19BB /* of3dUtils.h */; }; - E4F3BA6912F4C4BF002D19BB /* ofCamera.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4F3BA5512F4C4BF002D19BB /* ofCamera.cpp */; }; - E4F3BA6A12F4C4BF002D19BB /* ofCamera.h in Headers */ = {isa = PBXBuildFile; fileRef = E4F3BA5612F4C4BF002D19BB /* ofCamera.h */; }; - E4F3BA6B12F4C4BF002D19BB /* ofEasyCam.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4F3BA5712F4C4BF002D19BB /* ofEasyCam.cpp */; }; - E4F3BA6C12F4C4BF002D19BB /* ofEasyCam.h in Headers */ = {isa = PBXBuildFile; fileRef = E4F3BA5812F4C4BF002D19BB /* ofEasyCam.h */; }; - E4F3BA7312F4C4BF002D19BB /* ofNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4F3BA5F12F4C4BF002D19BB /* ofNode.cpp */; }; - E4F3BA7412F4C4BF002D19BB /* ofNode.h in Headers */ = {isa = PBXBuildFile; fileRef = E4F3BA6012F4C4BF002D19BB /* ofNode.h */; }; - E4F3BA8A12F4C4C9002D19BB /* ofFmodSoundPlayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4F3BA7E12F4C4C9002D19BB /* ofFmodSoundPlayer.cpp */; }; - E4F3BA8B12F4C4C9002D19BB /* ofFmodSoundPlayer.h in Headers */ = {isa = PBXBuildFile; fileRef = E4F3BA7F12F4C4C9002D19BB /* ofFmodSoundPlayer.h */; }; - E4F3BA8E12F4C4C9002D19BB /* ofSoundPlayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4F3BA8212F4C4C9002D19BB /* ofSoundPlayer.cpp */; }; - E4F3BA8F12F4C4C9002D19BB /* ofSoundPlayer.h in Headers */ = {isa = PBXBuildFile; fileRef = E4F3BA8312F4C4C9002D19BB /* ofSoundPlayer.h */; }; - E4F3BA9012F4C4C9002D19BB /* ofSoundStream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4F3BA8412F4C4C9002D19BB /* ofSoundStream.cpp */; }; - E4F3BA9112F4C4C9002D19BB /* ofSoundStream.h in Headers */ = {isa = PBXBuildFile; fileRef = E4F3BA8512F4C4C9002D19BB /* ofSoundStream.h */; }; - E4F3BAC112F4C72F002D19BB /* ofMath.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4F3BAB312F4C72E002D19BB /* ofMath.cpp */; }; - E4F3BAC212F4C72F002D19BB /* ofMath.h in Headers */ = {isa = PBXBuildFile; fileRef = E4F3BAB412F4C72E002D19BB /* ofMath.h */; }; - E4F3BAC312F4C72F002D19BB /* ofMatrix3x3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4F3BAB512F4C72E002D19BB /* ofMatrix3x3.cpp */; }; - E4F3BAC412F4C72F002D19BB /* ofMatrix3x3.h in Headers */ = {isa = PBXBuildFile; fileRef = E4F3BAB612F4C72E002D19BB /* ofMatrix3x3.h */; }; - E4F3BAC512F4C72F002D19BB /* ofMatrix4x4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4F3BAB712F4C72E002D19BB /* ofMatrix4x4.cpp */; }; - E4F3BAC612F4C72F002D19BB /* ofMatrix4x4.h in Headers */ = {isa = PBXBuildFile; fileRef = E4F3BAB812F4C72E002D19BB /* ofMatrix4x4.h */; }; - E4F3BAC712F4C72F002D19BB /* ofQuaternion.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4F3BAB912F4C72F002D19BB /* ofQuaternion.cpp */; }; - E4F3BAC812F4C72F002D19BB /* ofQuaternion.h in Headers */ = {isa = PBXBuildFile; fileRef = E4F3BABA12F4C72F002D19BB /* ofQuaternion.h */; }; - E4F3BAC912F4C72F002D19BB /* ofVec2f.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4F3BABB12F4C72F002D19BB /* ofVec2f.cpp */; }; - E4F3BACA12F4C72F002D19BB /* ofVec2f.h in Headers */ = {isa = PBXBuildFile; fileRef = E4F3BABC12F4C72F002D19BB /* ofVec2f.h */; }; - E4F3BACB12F4C72F002D19BB /* ofVec3f.h in Headers */ = {isa = PBXBuildFile; fileRef = E4F3BABD12F4C72F002D19BB /* ofVec3f.h */; }; - E4F3BACC12F4C72F002D19BB /* ofVec4f.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4F3BABE12F4C72F002D19BB /* ofVec4f.cpp */; }; - E4F3BACD12F4C72F002D19BB /* ofVec4f.h in Headers */ = {isa = PBXBuildFile; fileRef = E4F3BABF12F4C72F002D19BB /* ofVec4f.h */; }; - E4F3BACE12F4C72F002D19BB /* ofVectorMath.h in Headers */ = {isa = PBXBuildFile; fileRef = E4F3BAC012F4C72F002D19BB /* ofVectorMath.h */; }; - E4F3BAD912F4C73C002D19BB /* ofBaseTypes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4F3BAD012F4C73C002D19BB /* ofBaseTypes.cpp */; }; - E4F3BADB12F4C73C002D19BB /* ofColor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4F3BAD212F4C73C002D19BB /* ofColor.cpp */; }; - E4F3BADC12F4C73C002D19BB /* ofColor.h in Headers */ = {isa = PBXBuildFile; fileRef = E4F3BAD312F4C73C002D19BB /* ofColor.h */; }; - E4F3BADE12F4C73C002D19BB /* ofPoint.h in Headers */ = {isa = PBXBuildFile; fileRef = E4F3BAD512F4C73C002D19BB /* ofPoint.h */; }; - E4F3BADF12F4C73C002D19BB /* ofRectangle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4F3BAD612F4C73C002D19BB /* ofRectangle.cpp */; }; - E4F3BAE012F4C73C002D19BB /* ofRectangle.h in Headers */ = {isa = PBXBuildFile; fileRef = E4F3BAD712F4C73C002D19BB /* ofRectangle.h */; }; - E4F3BAE112F4C73C002D19BB /* ofTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = E4F3BAD812F4C73C002D19BB /* ofTypes.h */; }; - E4F3BAF112F4C745002D19BB /* ofConstants.h in Headers */ = {isa = PBXBuildFile; fileRef = E4F3BAE312F4C745002D19BB /* ofConstants.h */; }; - E4F3BAF212F4C745002D19BB /* ofFileUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4F3BAE412F4C745002D19BB /* ofFileUtils.cpp */; }; - E4F3BAF312F4C745002D19BB /* ofFileUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = E4F3BAE512F4C745002D19BB /* ofFileUtils.h */; }; - E4F3BAF412F4C745002D19BB /* ofLog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4F3BAE612F4C745002D19BB /* ofLog.cpp */; }; - E4F3BAF512F4C745002D19BB /* ofLog.h in Headers */ = {isa = PBXBuildFile; fileRef = E4F3BAE712F4C745002D19BB /* ofLog.h */; }; - E4F3BAF612F4C745002D19BB /* ofNoise.h in Headers */ = {isa = PBXBuildFile; fileRef = E4F3BAE812F4C745002D19BB /* ofNoise.h */; }; - E4F3BAF712F4C745002D19BB /* ofSystemUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4F3BAE912F4C745002D19BB /* ofSystemUtils.cpp */; settings = {COMPILER_FLAGS = "-x objective-c++"; }; }; - E4F3BAF812F4C745002D19BB /* ofSystemUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = E4F3BAEA12F4C745002D19BB /* ofSystemUtils.h */; }; - E4F3BAF912F4C745002D19BB /* ofThread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4F3BAEB12F4C745002D19BB /* ofThread.cpp */; }; - E4F3BAFA12F4C745002D19BB /* ofThread.h in Headers */ = {isa = PBXBuildFile; fileRef = E4F3BAEC12F4C745002D19BB /* ofThread.h */; }; - E4F3BAFB12F4C745002D19BB /* ofURLFileLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4F3BAED12F4C745002D19BB /* ofURLFileLoader.cpp */; }; - E4F3BAFC12F4C745002D19BB /* ofURLFileLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = E4F3BAEE12F4C745002D19BB /* ofURLFileLoader.h */; }; - E4F3BAFD12F4C745002D19BB /* ofUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4F3BAEF12F4C745002D19BB /* ofUtils.cpp */; }; - E4F3BAFE12F4C745002D19BB /* ofUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = E4F3BAF012F4C745002D19BB /* ofUtils.h */; }; - E4F3BB1812F4C752002D19BB /* ofBitmapFont.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4F3BB0012F4C751002D19BB /* ofBitmapFont.cpp */; }; - E4F3BB1912F4C752002D19BB /* ofBitmapFont.h in Headers */ = {isa = PBXBuildFile; fileRef = E4F3BB0112F4C751002D19BB /* ofBitmapFont.h */; }; - E4F3BB1C12F4C752002D19BB /* ofGraphics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4F3BB0412F4C752002D19BB /* ofGraphics.cpp */; }; - E4F3BB1D12F4C752002D19BB /* ofGraphics.h in Headers */ = {isa = PBXBuildFile; fileRef = E4F3BB0512F4C752002D19BB /* ofGraphics.h */; }; - E4F3BB1E12F4C752002D19BB /* ofImage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4F3BB0612F4C752002D19BB /* ofImage.cpp */; }; - E4F3BB1F12F4C752002D19BB /* ofImage.h in Headers */ = {isa = PBXBuildFile; fileRef = E4F3BB0712F4C752002D19BB /* ofImage.h */; }; - E4F3BB2012F4C752002D19BB /* ofPixels.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4F3BB0812F4C752002D19BB /* ofPixels.cpp */; }; - E4F3BB2112F4C752002D19BB /* ofPixels.h in Headers */ = {isa = PBXBuildFile; fileRef = E4F3BB0912F4C752002D19BB /* ofPixels.h */; }; - E4F3BB2A12F4C752002D19BB /* ofTessellator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4F3BB1212F4C752002D19BB /* ofTessellator.cpp */; }; - E4F3BB2B12F4C752002D19BB /* ofTessellator.h in Headers */ = {isa = PBXBuildFile; fileRef = E4F3BB1312F4C752002D19BB /* ofTessellator.h */; }; - E4F3BB2E12F4C752002D19BB /* ofTrueTypeFont.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4F3BB1612F4C752002D19BB /* ofTrueTypeFont.cpp */; }; - E4F3BB2F12F4C752002D19BB /* ofTrueTypeFont.h in Headers */ = {isa = PBXBuildFile; fileRef = E4F3BB1712F4C752002D19BB /* ofTrueTypeFont.h */; }; + 031A7A542CD5F33300797180 /* cairo.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF5BF8492B737E260049DEF6 /* cairo.xcframework */; }; + 031A7A562CD5F33400797180 /* curl.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF6276A32BAD6639008864C1 /* curl.xcframework */; }; + 031A7A582CD5F33600797180 /* FreeImage.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF5BF84B2B737E320049DEF6 /* FreeImage.xcframework */; }; + 031A7A5A2CD5F33700797180 /* freetype.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF5BF84D2B737E3B0049DEF6 /* freetype.xcframework */; }; + 031A7A5C2CD5F33B00797180 /* glew.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF5BF84F2B737E440049DEF6 /* glew.xcframework */; }; + 031A7A5E2CD5F33C00797180 /* glfw.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF5BF8512B737E4E0049DEF6 /* glfw.xcframework */; }; + 031A7A602CD5F33E00797180 /* libpng.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF5BF8532B737E880049DEF6 /* libpng.xcframework */; }; + 031A7A622CD5F33F00797180 /* openssl.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF6276A12BAD6619008864C1 /* openssl.xcframework */; }; + 031A7A642CD5F34100797180 /* pixman.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF5BF8552B737E930049DEF6 /* pixman.xcframework */; }; + 031A7A662CD5F34200797180 /* pugixml.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF5BF8472B737D280049DEF6 /* pugixml.xcframework */; }; + 031A7A682CD5F34500797180 /* rtAudio.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF5BF8452B737C870049DEF6 /* rtAudio.xcframework */; }; + 031A7A6A2CD5F34500797180 /* tess2.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF5BF8432B737C7C0049DEF6 /* tess2.xcframework */; }; + 031A7A6C2CD5F34A00797180 /* uriparser.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF5BF8412B737C700049DEF6 /* uriparser.xcframework */; }; + 031A7A6E2CD5F34A00797180 /* zlib.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF5BF83F2B737C0A0049DEF6 /* zlib.xcframework */; }; + 037A65F92CD72C1000CF8AC1 /* brotli.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF7C462D2C097CCE00461163 /* brotli.xcframework */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ - 19662F2C2834A44400B622ED /* ofGraphicsCairo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofGraphicsCairo.h; sourceTree = ""; }; - 19662F2D2834A44400B622ED /* ofGraphicsCairo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ofGraphicsCairo.cpp; sourceTree = ""; }; - 22246D91176C9987008A8AF4 /* ofGLProgrammableRenderer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ofGLProgrammableRenderer.cpp; path = gl/ofGLProgrammableRenderer.cpp; sourceTree = ""; }; - 22246D92176C9987008A8AF4 /* ofGLProgrammableRenderer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofGLProgrammableRenderer.h; path = gl/ofGLProgrammableRenderer.h; sourceTree = ""; }; - 2276958F170D9DD200604FC3 /* ofMatrixStack.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ofMatrixStack.cpp; sourceTree = ""; }; - 22769590170D9DD200604FC3 /* ofMatrixStack.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofMatrixStack.h; sourceTree = ""; }; - 2292E73C19E3049700DE9411 /* ofBufferObject.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ofBufferObject.cpp; path = gl/ofBufferObject.cpp; sourceTree = ""; }; - 2292E73D19E3049700DE9411 /* ofBufferObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofBufferObject.h; path = gl/ofBufferObject.h; sourceTree = ""; }; - 229EB9A51B3181C800FF7B5F /* ofEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofEvent.h; sourceTree = ""; }; - 22A1C452170AFCB60079E473 /* ofRendererCollection.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ofRendererCollection.cpp; sourceTree = ""; }; - 22FAD01C17049373002A7EB3 /* ofAppGLFWWindow.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; path = ofAppGLFWWindow.cpp; sourceTree = ""; }; - 22FAD01D17049373002A7EB3 /* ofAppGLFWWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofAppGLFWWindow.h; sourceTree = ""; }; - 27DEA30F1796F578000A9E90 /* ofXml.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ofXml.cpp; sourceTree = ""; }; - 27DEA3101796F578000A9E90 /* ofXml.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofXml.h; sourceTree = ""; }; - 2E498911292C96340096EC56 /* ofCubeMap.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ofCubeMap.cpp; path = gl/ofCubeMap.cpp; sourceTree = ""; }; - 2E498912292C96340096EC56 /* ofCubeMapShaders.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofCubeMapShaders.h; path = gl/ofCubeMapShaders.h; sourceTree = ""; }; - 2E498913292C96340096EC56 /* ofCubeMap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofCubeMap.h; path = gl/ofCubeMap.h; sourceTree = ""; }; - 2E4D30BF28F5BA9C0074D450 /* ofShadow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofShadow.h; path = gl/ofShadow.h; sourceTree = ""; }; - 2E4D30C028F5BA9C0074D450 /* ofShadow.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ofShadow.cpp; path = gl/ofShadow.cpp; sourceTree = ""; }; - 2E6EA7001603A9E400B7ADF3 /* of3dGraphics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = of3dGraphics.h; sourceTree = ""; }; - 2E6EA7031603AA7A00B7ADF3 /* of3dGraphics.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = of3dGraphics.cpp; sourceTree = ""; }; - 2E6EA7051603AABD00B7ADF3 /* of3dPrimitives.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = of3dPrimitives.h; sourceTree = ""; }; - 2E6EA7071603AAD600B7ADF3 /* of3dPrimitives.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = of3dPrimitives.cpp; sourceTree = ""; }; - 30CC5384207A36FD008234AF /* ofMathConstants.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofMathConstants.h; sourceTree = ""; }; - 53EEEF49130766EF0027C199 /* ofMesh.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofMesh.h; sourceTree = ""; }; - 6448E6FB1CAD7679000877BC /* ofMesh.inl */ = {isa = PBXFileReference; lastKnownFileType = text; path = ofMesh.inl; sourceTree = ""; }; - 6448E6FC1CAD771D000877BC /* ofPolyline.inl */ = {isa = PBXFileReference; lastKnownFileType = text; path = ofPolyline.inl; sourceTree = ""; }; - 6678E96D19FEAFA900C00581 /* ofSoundBuffer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ofSoundBuffer.cpp; sourceTree = ""; }; - 6678E96E19FEAFA900C00581 /* ofSoundBuffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofSoundBuffer.h; sourceTree = ""; }; - 6678E97C19FEB5A600C00581 /* ofSoundUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofSoundUtils.h; sourceTree = ""; }; - 6766729D1A749D1900400051 /* ofAVFoundationVideoPlayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ofAVFoundationVideoPlayer.m; sourceTree = ""; }; - 6766729E1A749D1900400051 /* ofAVFoundationPlayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofAVFoundationPlayer.h; sourceTree = ""; }; - 6766729F1A749D1900400051 /* ofAVFoundationVideoPlayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofAVFoundationVideoPlayer.h; sourceTree = ""; }; - 676672A21A749D1900400051 /* ofAVFoundationPlayer.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ofAVFoundationPlayer.mm; sourceTree = ""; }; - 67D96B941651AF6D00D5242D /* ofGLUtils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ofGLUtils.cpp; path = gl/ofGLUtils.cpp; sourceTree = ""; }; - 692C298719DC5C5500C27C5D /* ofFpsCounter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ofFpsCounter.cpp; sourceTree = ""; }; - 692C298819DC5C5500C27C5D /* ofFpsCounter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofFpsCounter.h; sourceTree = ""; }; - 692C298919DC5C5500C27C5D /* ofTimer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ofTimer.cpp; sourceTree = ""; }; - 692C298A19DC5C5500C27C5D /* ofTimer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofTimer.h; sourceTree = ""; }; - 694425151FE4544C00770088 /* ofGLBaseTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofGLBaseTypes.h; path = gl/ofGLBaseTypes.h; sourceTree = ""; }; - 694425171FE4547400770088 /* ofGraphicsBaseTypes.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ofGraphicsBaseTypes.cpp; sourceTree = ""; }; - 694425181FE4547400770088 /* ofGraphicsBaseTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofGraphicsBaseTypes.h; sourceTree = ""; }; - 694425191FE4547400770088 /* ofGraphicsConstants.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofGraphicsConstants.h; sourceTree = ""; }; - 6944251D1FE4548B00770088 /* ofSoundBaseTypes.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ofSoundBaseTypes.cpp; sourceTree = ""; }; - 6944251E1FE4548B00770088 /* ofSoundBaseTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofSoundBaseTypes.h; sourceTree = ""; }; - 694425211FE456AF00770088 /* ofVideoBaseTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofVideoBaseTypes.h; sourceTree = ""; }; - 772BDF71146928600030F0EE /* ofOpenALSoundPlayer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ofOpenALSoundPlayer.cpp; sourceTree = ""; }; - 772BDF72146928600030F0EE /* ofOpenALSoundPlayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofOpenALSoundPlayer.h; sourceTree = ""; }; - 92C55F86132DA7DD00EC2631 /* ofPath.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ofPath.cpp; sourceTree = ""; }; - 92C55F87132DA7DD00EC2631 /* ofPath.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofPath.h; sourceTree = ""; }; - 9979E81F1A1CCC44007E55D1 /* ofWindowSettings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofWindowSettings.h; sourceTree = ""; }; - 9979E8201A1CCC44007E55D1 /* ofMainLoop.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ofMainLoop.cpp; sourceTree = ""; }; - 9979E8211A1CCC44007E55D1 /* ofMainLoop.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofMainLoop.h; sourceTree = ""; }; - BBA81C421FFBE4DB0064EA94 /* ofBaseApp.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ofBaseApp.cpp; sourceTree = ""; }; - DA48FE74131D85A6000062BC /* ofPolyline.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofPolyline.h; sourceTree = ""; }; - DA94C2ED1301D32200CCC773 /* ofRendererCollection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofRendererCollection.h; sourceTree = ""; }; - DA97FD3612F5A61A005C9991 /* ofCairoRenderer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ofCairoRenderer.cpp; sourceTree = ""; }; - DA97FD3712F5A61A005C9991 /* ofCairoRenderer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofCairoRenderer.h; sourceTree = ""; }; - DAC22D3B16E7A4AF0020226D /* ofParameter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ofParameter.cpp; sourceTree = ""; }; - DAC22D3C16E7A4AF0020226D /* ofParameter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofParameter.h; sourceTree = ""; }; - DAC22D3D16E7A4AF0020226D /* ofParameterGroup.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ofParameterGroup.cpp; sourceTree = ""; }; - DAC22D3E16E7A4AF0020226D /* ofParameterGroup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofParameterGroup.h; sourceTree = ""; }; - DACFA8C9132D09E8008D4B7A /* ofFbo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ofFbo.cpp; path = gl/ofFbo.cpp; sourceTree = ""; }; - DACFA8CA132D09E8008D4B7A /* ofFbo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofFbo.h; path = gl/ofFbo.h; sourceTree = ""; }; - DACFA8CB132D09E8008D4B7A /* ofGLRenderer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ofGLRenderer.cpp; path = gl/ofGLRenderer.cpp; sourceTree = ""; }; - DACFA8CC132D09E8008D4B7A /* ofGLRenderer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofGLRenderer.h; path = gl/ofGLRenderer.h; sourceTree = ""; }; - DACFA8CD132D09E8008D4B7A /* ofGLUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofGLUtils.h; path = gl/ofGLUtils.h; sourceTree = ""; }; - DACFA8CE132D09E8008D4B7A /* ofLight.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ofLight.cpp; path = gl/ofLight.cpp; sourceTree = ""; }; - DACFA8CF132D09E8008D4B7A /* ofLight.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofLight.h; path = gl/ofLight.h; sourceTree = ""; }; - DACFA8D0132D09E8008D4B7A /* ofMaterial.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ofMaterial.cpp; path = gl/ofMaterial.cpp; sourceTree = ""; }; - DACFA8D1132D09E8008D4B7A /* ofMaterial.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofMaterial.h; path = gl/ofMaterial.h; sourceTree = ""; }; - DACFA8D2132D09E8008D4B7A /* ofShader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ofShader.cpp; path = gl/ofShader.cpp; sourceTree = ""; }; - DACFA8D3132D09E8008D4B7A /* ofShader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofShader.h; path = gl/ofShader.h; sourceTree = ""; }; - DACFA8D4132D09E8008D4B7A /* ofTexture.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ofTexture.cpp; path = gl/ofTexture.cpp; sourceTree = ""; }; - DACFA8D5132D09E8008D4B7A /* ofTexture.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofTexture.h; path = gl/ofTexture.h; sourceTree = ""; }; - DACFA8D6132D09E8008D4B7A /* ofVbo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ofVbo.cpp; path = gl/ofVbo.cpp; sourceTree = ""; }; - DACFA8D7132D09E8008D4B7A /* ofVbo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofVbo.h; path = gl/ofVbo.h; sourceTree = ""; }; - DACFA8D8132D09E8008D4B7A /* ofVboMesh.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ofVboMesh.cpp; path = gl/ofVboMesh.cpp; sourceTree = ""; }; - DACFA8D9132D09E8008D4B7A /* ofVboMesh.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofVboMesh.h; path = gl/ofVboMesh.h; sourceTree = ""; }; + BF5BF83F2B737C0A0049DEF6 /* zlib.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = zlib.xcframework; path = ../../../zlib/lib/macos/zlib.xcframework; sourceTree = ""; }; + BF5BF8412B737C700049DEF6 /* uriparser.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = uriparser.xcframework; path = ../../../uriparser/lib/macos/uriparser.xcframework; sourceTree = ""; }; + BF5BF8432B737C7C0049DEF6 /* tess2.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = tess2.xcframework; path = ../../../tess2/lib/macos/tess2.xcframework; sourceTree = ""; }; + BF5BF8452B737C870049DEF6 /* rtAudio.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = rtAudio.xcframework; path = ../../../rtAudio/lib/macos/rtAudio.xcframework; sourceTree = ""; }; + BF5BF8472B737D280049DEF6 /* pugixml.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = pugixml.xcframework; path = ../../../pugixml/lib/macos/pugixml.xcframework; sourceTree = ""; }; + BF5BF8492B737E260049DEF6 /* cairo.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = cairo.xcframework; path = ../../../cairo/lib/macos/cairo.xcframework; sourceTree = ""; }; + BF5BF84B2B737E320049DEF6 /* FreeImage.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = FreeImage.xcframework; path = ../../../FreeImage/lib/macos/FreeImage.xcframework; sourceTree = ""; }; + BF5BF84D2B737E3B0049DEF6 /* freetype.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = freetype.xcframework; path = ../../../freetype/lib/macos/freetype.xcframework; sourceTree = ""; }; + BF5BF84F2B737E440049DEF6 /* glew.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = glew.xcframework; path = ../../../glew/lib/macos/glew.xcframework; sourceTree = ""; }; + BF5BF8512B737E4E0049DEF6 /* glfw.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = glfw.xcframework; path = ../../../glfw/lib/macos/glfw.xcframework; sourceTree = ""; }; + BF5BF8532B737E880049DEF6 /* libpng.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = libpng.xcframework; path = ../../../libpng/lib/macos/libpng.xcframework; sourceTree = ""; }; + BF5BF8552B737E930049DEF6 /* pixman.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = pixman.xcframework; path = ../../../pixman/lib/macos/pixman.xcframework; sourceTree = ""; }; + BF6276A12BAD6619008864C1 /* openssl.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = openssl.xcframework; path = ../../../openssl/lib/macos/openssl.xcframework; sourceTree = ""; }; + BF6276A32BAD6639008864C1 /* curl.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = curl.xcframework; path = ../../../curl/lib/macos/curl.xcframework; sourceTree = ""; }; + BF7C462D2C097CCE00461163 /* brotli.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = brotli.xcframework; path = ../../../brotli/lib/macos/brotli.xcframework; sourceTree = ""; }; E432815E138ABFDD0047C5CB /* Shared.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Shared.xcconfig; sourceTree = ""; }; E432815F138AC0470047C5CB /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = ""; }; E4328160138AC04A0047C5CB /* Release.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = ""; }; - E48662981D8C61B000D1735C /* ofAVFoundationGrabber.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.h; fileEncoding = 4; path = ofAVFoundationGrabber.h; sourceTree = ""; }; - E48662991D8C61B000D1735C /* ofAVFoundationGrabber.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ofAVFoundationGrabber.mm; sourceTree = ""; }; - E495DF7B178896A900994238 /* ofAppNoWindow.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ofAppNoWindow.cpp; sourceTree = ""; }; - E495DF7C178896A900994238 /* ofAppNoWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofAppNoWindow.h; sourceTree = ""; }; - E4998A25128A39480094AC3F /* ofEvents.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ofEvents.cpp; sourceTree = ""; }; - E4B27AAC10CBE92A00536013 /* ofAppBaseWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofAppBaseWindow.h; path = ../../../openFrameworks/app/ofAppBaseWindow.h; sourceTree = SOURCE_ROOT; }; - E4B27AAF10CBE92A00536013 /* ofAppRunner.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ofAppRunner.cpp; path = ../../../openFrameworks/app/ofAppRunner.cpp; sourceTree = SOURCE_ROOT; }; - E4B27AB010CBE92A00536013 /* ofAppRunner.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofAppRunner.h; path = ../../../openFrameworks/app/ofAppRunner.h; sourceTree = SOURCE_ROOT; }; - E4B27AB110CBE92A00536013 /* ofBaseApp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofBaseApp.h; path = ../../../openFrameworks/app/ofBaseApp.h; sourceTree = SOURCE_ROOT; }; - E4B27AB310CBE92A00536013 /* ofArduino.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ofArduino.cpp; path = ../../../openFrameworks/communication/ofArduino.cpp; sourceTree = SOURCE_ROOT; }; - E4B27AB410CBE92A00536013 /* ofArduino.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofArduino.h; path = ../../../openFrameworks/communication/ofArduino.h; sourceTree = SOURCE_ROOT; }; - E4B27AB510CBE92A00536013 /* ofSerial.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ofSerial.cpp; path = ../../../openFrameworks/communication/ofSerial.cpp; sourceTree = SOURCE_ROOT; }; - E4B27AB610CBE92A00536013 /* ofSerial.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofSerial.h; path = ../../../openFrameworks/communication/ofSerial.h; sourceTree = SOURCE_ROOT; }; - E4B27ABA10CBE92A00536013 /* ofEvents.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofEvents.h; path = ../../../openFrameworks/events/ofEvents.h; sourceTree = SOURCE_ROOT; }; - E4B27ABB10CBE92A00536013 /* ofEventUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofEventUtils.h; path = ../../../openFrameworks/events/ofEventUtils.h; sourceTree = SOURCE_ROOT; }; - E4B27AC710CBE92A00536013 /* ofMain.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofMain.h; path = ../../../openFrameworks/ofMain.h; sourceTree = SOURCE_ROOT; }; - E4B27ADB10CBE92A00536013 /* ofVideoGrabber.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ofVideoGrabber.cpp; path = ../../../openFrameworks/video/ofVideoGrabber.cpp; sourceTree = SOURCE_ROOT; }; - E4B27ADC10CBE92A00536013 /* ofVideoGrabber.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofVideoGrabber.h; path = ../../../openFrameworks/video/ofVideoGrabber.h; sourceTree = SOURCE_ROOT; }; - E4B27ADD10CBE92A00536013 /* ofVideoPlayer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ofVideoPlayer.cpp; path = ../../../openFrameworks/video/ofVideoPlayer.cpp; sourceTree = SOURCE_ROOT; }; - E4B27ADE10CBE92A00536013 /* ofVideoPlayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofVideoPlayer.h; path = ../../../openFrameworks/video/ofVideoPlayer.h; sourceTree = SOURCE_ROOT; }; E4B27C1510CBEB8E00536013 /* openFrameworksDebug.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = openFrameworksDebug.a; sourceTree = BUILT_PRODUCTS_DIR; }; - E4C5E385131AC1B10050F992 /* ofRtAudioSoundStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofRtAudioSoundStream.h; sourceTree = ""; }; - E4C5E386131AC1B10050F992 /* ofRtAudioSoundStream.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ofRtAudioSoundStream.cpp; sourceTree = ""; }; E4EB6916138AFC8500A09F29 /* CoreOF.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = CoreOF.xcconfig; sourceTree = ""; }; - E4F3BA5312F4C4BF002D19BB /* of3dUtils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = of3dUtils.cpp; path = ../../../openFrameworks/3d/of3dUtils.cpp; sourceTree = SOURCE_ROOT; }; - E4F3BA5412F4C4BF002D19BB /* of3dUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = of3dUtils.h; path = ../../../openFrameworks/3d/of3dUtils.h; sourceTree = SOURCE_ROOT; }; - E4F3BA5512F4C4BF002D19BB /* ofCamera.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ofCamera.cpp; path = ../../../openFrameworks/3d/ofCamera.cpp; sourceTree = SOURCE_ROOT; }; - E4F3BA5612F4C4BF002D19BB /* ofCamera.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofCamera.h; path = ../../../openFrameworks/3d/ofCamera.h; sourceTree = SOURCE_ROOT; }; - E4F3BA5712F4C4BF002D19BB /* ofEasyCam.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ofEasyCam.cpp; path = ../../../openFrameworks/3d/ofEasyCam.cpp; sourceTree = SOURCE_ROOT; }; - E4F3BA5812F4C4BF002D19BB /* ofEasyCam.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofEasyCam.h; path = ../../../openFrameworks/3d/ofEasyCam.h; sourceTree = SOURCE_ROOT; }; - E4F3BA5F12F4C4BF002D19BB /* ofNode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ofNode.cpp; path = ../../../openFrameworks/3d/ofNode.cpp; sourceTree = SOURCE_ROOT; }; - E4F3BA6012F4C4BF002D19BB /* ofNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofNode.h; path = ../../../openFrameworks/3d/ofNode.h; sourceTree = SOURCE_ROOT; }; - E4F3BA7E12F4C4C9002D19BB /* ofFmodSoundPlayer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ofFmodSoundPlayer.cpp; path = ../../../openFrameworks/sound/ofFmodSoundPlayer.cpp; sourceTree = SOURCE_ROOT; }; - E4F3BA7F12F4C4C9002D19BB /* ofFmodSoundPlayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofFmodSoundPlayer.h; path = ../../../openFrameworks/sound/ofFmodSoundPlayer.h; sourceTree = SOURCE_ROOT; }; - E4F3BA8212F4C4C9002D19BB /* ofSoundPlayer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ofSoundPlayer.cpp; path = ../../../openFrameworks/sound/ofSoundPlayer.cpp; sourceTree = SOURCE_ROOT; }; - E4F3BA8312F4C4C9002D19BB /* ofSoundPlayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofSoundPlayer.h; path = ../../../openFrameworks/sound/ofSoundPlayer.h; sourceTree = SOURCE_ROOT; }; - E4F3BA8412F4C4C9002D19BB /* ofSoundStream.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ofSoundStream.cpp; path = ../../../openFrameworks/sound/ofSoundStream.cpp; sourceTree = SOURCE_ROOT; }; - E4F3BA8512F4C4C9002D19BB /* ofSoundStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofSoundStream.h; path = ../../../openFrameworks/sound/ofSoundStream.h; sourceTree = SOURCE_ROOT; }; - E4F3BAB312F4C72E002D19BB /* ofMath.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ofMath.cpp; path = ../../../openFrameworks/math/ofMath.cpp; sourceTree = SOURCE_ROOT; }; - E4F3BAB412F4C72E002D19BB /* ofMath.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofMath.h; path = ../../../openFrameworks/math/ofMath.h; sourceTree = SOURCE_ROOT; }; - E4F3BAB512F4C72E002D19BB /* ofMatrix3x3.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ofMatrix3x3.cpp; path = ../../../openFrameworks/math/ofMatrix3x3.cpp; sourceTree = SOURCE_ROOT; }; - E4F3BAB612F4C72E002D19BB /* ofMatrix3x3.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofMatrix3x3.h; path = ../../../openFrameworks/math/ofMatrix3x3.h; sourceTree = SOURCE_ROOT; }; - E4F3BAB712F4C72E002D19BB /* ofMatrix4x4.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ofMatrix4x4.cpp; path = ../../../openFrameworks/math/ofMatrix4x4.cpp; sourceTree = SOURCE_ROOT; }; - E4F3BAB812F4C72E002D19BB /* ofMatrix4x4.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofMatrix4x4.h; path = ../../../openFrameworks/math/ofMatrix4x4.h; sourceTree = SOURCE_ROOT; }; - E4F3BAB912F4C72F002D19BB /* ofQuaternion.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ofQuaternion.cpp; path = ../../../openFrameworks/math/ofQuaternion.cpp; sourceTree = SOURCE_ROOT; }; - E4F3BABA12F4C72F002D19BB /* ofQuaternion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofQuaternion.h; path = ../../../openFrameworks/math/ofQuaternion.h; sourceTree = SOURCE_ROOT; }; - E4F3BABB12F4C72F002D19BB /* ofVec2f.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ofVec2f.cpp; path = ../../../openFrameworks/math/ofVec2f.cpp; sourceTree = SOURCE_ROOT; }; - E4F3BABC12F4C72F002D19BB /* ofVec2f.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofVec2f.h; path = ../../../openFrameworks/math/ofVec2f.h; sourceTree = SOURCE_ROOT; }; - E4F3BABD12F4C72F002D19BB /* ofVec3f.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofVec3f.h; path = ../../../openFrameworks/math/ofVec3f.h; sourceTree = SOURCE_ROOT; }; - E4F3BABE12F4C72F002D19BB /* ofVec4f.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ofVec4f.cpp; path = ../../../openFrameworks/math/ofVec4f.cpp; sourceTree = SOURCE_ROOT; }; - E4F3BABF12F4C72F002D19BB /* ofVec4f.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofVec4f.h; path = ../../../openFrameworks/math/ofVec4f.h; sourceTree = SOURCE_ROOT; }; - E4F3BAC012F4C72F002D19BB /* ofVectorMath.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofVectorMath.h; path = ../../../openFrameworks/math/ofVectorMath.h; sourceTree = SOURCE_ROOT; }; - E4F3BAD012F4C73C002D19BB /* ofBaseTypes.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ofBaseTypes.cpp; path = ../../../openFrameworks/types/ofBaseTypes.cpp; sourceTree = SOURCE_ROOT; }; - E4F3BAD212F4C73C002D19BB /* ofColor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ofColor.cpp; path = ../../../openFrameworks/types/ofColor.cpp; sourceTree = SOURCE_ROOT; }; - E4F3BAD312F4C73C002D19BB /* ofColor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofColor.h; path = ../../../openFrameworks/types/ofColor.h; sourceTree = SOURCE_ROOT; }; - E4F3BAD512F4C73C002D19BB /* ofPoint.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofPoint.h; path = ../../../openFrameworks/types/ofPoint.h; sourceTree = SOURCE_ROOT; }; - E4F3BAD612F4C73C002D19BB /* ofRectangle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ofRectangle.cpp; path = ../../../openFrameworks/types/ofRectangle.cpp; sourceTree = SOURCE_ROOT; }; - E4F3BAD712F4C73C002D19BB /* ofRectangle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofRectangle.h; path = ../../../openFrameworks/types/ofRectangle.h; sourceTree = SOURCE_ROOT; }; - E4F3BAD812F4C73C002D19BB /* ofTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofTypes.h; path = ../../../openFrameworks/types/ofTypes.h; sourceTree = SOURCE_ROOT; }; - E4F3BAE312F4C745002D19BB /* ofConstants.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofConstants.h; path = ../../../openFrameworks/utils/ofConstants.h; sourceTree = SOURCE_ROOT; }; - E4F3BAE412F4C745002D19BB /* ofFileUtils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ofFileUtils.cpp; path = ../../../openFrameworks/utils/ofFileUtils.cpp; sourceTree = SOURCE_ROOT; }; - E4F3BAE512F4C745002D19BB /* ofFileUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofFileUtils.h; path = ../../../openFrameworks/utils/ofFileUtils.h; sourceTree = SOURCE_ROOT; }; - E4F3BAE612F4C745002D19BB /* ofLog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ofLog.cpp; path = ../../../openFrameworks/utils/ofLog.cpp; sourceTree = SOURCE_ROOT; }; - E4F3BAE712F4C745002D19BB /* ofLog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofLog.h; path = ../../../openFrameworks/utils/ofLog.h; sourceTree = SOURCE_ROOT; }; - E4F3BAE812F4C745002D19BB /* ofNoise.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofNoise.h; path = ../../../openFrameworks/utils/ofNoise.h; sourceTree = SOURCE_ROOT; }; - E4F3BAE912F4C745002D19BB /* ofSystemUtils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ofSystemUtils.cpp; path = ../../../openFrameworks/utils/ofSystemUtils.cpp; sourceTree = SOURCE_ROOT; }; - E4F3BAEA12F4C745002D19BB /* ofSystemUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofSystemUtils.h; path = ../../../openFrameworks/utils/ofSystemUtils.h; sourceTree = SOURCE_ROOT; }; - E4F3BAEB12F4C745002D19BB /* ofThread.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ofThread.cpp; path = ../../../openFrameworks/utils/ofThread.cpp; sourceTree = SOURCE_ROOT; }; - E4F3BAEC12F4C745002D19BB /* ofThread.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofThread.h; path = ../../../openFrameworks/utils/ofThread.h; sourceTree = SOURCE_ROOT; }; - E4F3BAED12F4C745002D19BB /* ofURLFileLoader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ofURLFileLoader.cpp; path = ../../../openFrameworks/utils/ofURLFileLoader.cpp; sourceTree = SOURCE_ROOT; }; - E4F3BAEE12F4C745002D19BB /* ofURLFileLoader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofURLFileLoader.h; path = ../../../openFrameworks/utils/ofURLFileLoader.h; sourceTree = SOURCE_ROOT; }; - E4F3BAEF12F4C745002D19BB /* ofUtils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ofUtils.cpp; path = ../../../openFrameworks/utils/ofUtils.cpp; sourceTree = SOURCE_ROOT; }; - E4F3BAF012F4C745002D19BB /* ofUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofUtils.h; path = ../../../openFrameworks/utils/ofUtils.h; sourceTree = SOURCE_ROOT; }; - E4F3BB0012F4C751002D19BB /* ofBitmapFont.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ofBitmapFont.cpp; path = ../../../openFrameworks/graphics/ofBitmapFont.cpp; sourceTree = SOURCE_ROOT; }; - E4F3BB0112F4C751002D19BB /* ofBitmapFont.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofBitmapFont.h; path = ../../../openFrameworks/graphics/ofBitmapFont.h; sourceTree = SOURCE_ROOT; }; - E4F3BB0412F4C752002D19BB /* ofGraphics.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ofGraphics.cpp; path = ../../../openFrameworks/graphics/ofGraphics.cpp; sourceTree = SOURCE_ROOT; }; - E4F3BB0512F4C752002D19BB /* ofGraphics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofGraphics.h; path = ../../../openFrameworks/graphics/ofGraphics.h; sourceTree = SOURCE_ROOT; }; - E4F3BB0612F4C752002D19BB /* ofImage.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ofImage.cpp; path = ../../../openFrameworks/graphics/ofImage.cpp; sourceTree = SOURCE_ROOT; }; - E4F3BB0712F4C752002D19BB /* ofImage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofImage.h; path = ../../../openFrameworks/graphics/ofImage.h; sourceTree = SOURCE_ROOT; }; - E4F3BB0812F4C752002D19BB /* ofPixels.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ofPixels.cpp; path = ../../../openFrameworks/graphics/ofPixels.cpp; sourceTree = SOURCE_ROOT; }; - E4F3BB0912F4C752002D19BB /* ofPixels.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofPixels.h; path = ../../../openFrameworks/graphics/ofPixels.h; sourceTree = SOURCE_ROOT; }; - E4F3BB1212F4C752002D19BB /* ofTessellator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ofTessellator.cpp; path = ../../../openFrameworks/graphics/ofTessellator.cpp; sourceTree = SOURCE_ROOT; }; - E4F3BB1312F4C752002D19BB /* ofTessellator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofTessellator.h; path = ../../../openFrameworks/graphics/ofTessellator.h; sourceTree = SOURCE_ROOT; }; - E4F3BB1612F4C752002D19BB /* ofTrueTypeFont.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ofTrueTypeFont.cpp; path = ../../../openFrameworks/graphics/ofTrueTypeFont.cpp; sourceTree = SOURCE_ROOT; }; - E4F3BB1712F4C752002D19BB /* ofTrueTypeFont.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofTrueTypeFont.h; path = ../../../openFrameworks/graphics/ofTrueTypeFont.h; sourceTree = SOURCE_ROOT; }; /* End PBXFileReference section */ +/* Begin PBXFileSystemSynchronizedBuildFileExceptionSet section */ + 03EF26B12CD5D9FD005A5E4D /* PBXFileSystemSynchronizedBuildFileExceptionSet */ = { + isa = PBXFileSystemSynchronizedBuildFileExceptionSet; + membershipExceptions = ( + app/ofAppEGLWindow.cpp, + app/ofAppEGLWindow.h, + app/ofIcon.h, + communication/ofArduino.cpp, + communication/ofArduino.h, + math/ofMatrix3x3.cpp, + math/ofMatrix3x3.h, + math/ofMatrix4x4.cpp, + math/ofMatrix4x4.h, + math/ofQuaternion.cpp, + math/ofQuaternion.h, + math/ofVec2f.cpp, + math/ofVec2f.h, + math/ofVec3f.h, + math/ofVec4f.cpp, + math/ofVec4f.h, + math/ofVectorMath.h, + sound/ofFmodSoundPlayer.cpp, + sound/ofFmodSoundPlayer.h, + sound/ofMediaFoundationSoundPlayer.cpp, + sound/ofMediaFoundationSoundPlayer.h, + sound/ofOpenALSoundPlayer.cpp, + sound/ofOpenALSoundPlayer.h, + sound/ofRtAudioSoundStream.cpp, + sound/ofRtAudioSoundStream.h, + types/ofPoint.h, + video/ofDirectShowGrabber.cpp, + video/ofDirectShowGrabber.h, + video/ofDirectShowPlayer.cpp, + video/ofDirectShowPlayer.h, + video/ofGstUtils.cpp, + video/ofGstUtils.h, + video/ofGstVideoGrabber.cpp, + video/ofGstVideoGrabber.h, + video/ofGstVideoPlayer.cpp, + video/ofGstVideoPlayer.h, + video/ofMediaFoundationPlayer.cpp, + video/ofMediaFoundationPlayer.h, + ); + target = E4B27C1410CBEB8E00536013 /* openFrameworks */; + }; +/* End PBXFileSystemSynchronizedBuildFileExceptionSet section */ + +/* Begin PBXFileSystemSynchronizedRootGroup section */ + 03EF25F52CD5D9C4005A5E4D /* openFrameworks */ = {isa = PBXFileSystemSynchronizedRootGroup; exceptions = (03EF26B12CD5D9FD005A5E4D /* PBXFileSystemSynchronizedBuildFileExceptionSet */, ); explicitFileTypes = {app/ofAppGLFWWindow.cpp = sourcecode.cpp.objcpp; }; explicitFolders = (); name = openFrameworks; path = ../../../openFrameworks; sourceTree = ""; }; +/* End PBXFileSystemSynchronizedRootGroup section */ + /* Begin PBXFrameworksBuildPhase section */ E4B27C1310CBEB8E00536013 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 031A7A6E2CD5F34A00797180 /* zlib.xcframework in Frameworks */, + 037A65F92CD72C1000CF8AC1 /* brotli.xcframework in Frameworks */, + 031A7A6A2CD5F34500797180 /* tess2.xcframework in Frameworks */, + 031A7A622CD5F33F00797180 /* openssl.xcframework in Frameworks */, + 031A7A542CD5F33300797180 /* cairo.xcframework in Frameworks */, + 031A7A5C2CD5F33B00797180 /* glew.xcframework in Frameworks */, + 031A7A642CD5F34100797180 /* pixman.xcframework in Frameworks */, + 031A7A5A2CD5F33700797180 /* freetype.xcframework in Frameworks */, + 031A7A682CD5F34500797180 /* rtAudio.xcframework in Frameworks */, + 031A7A602CD5F33E00797180 /* libpng.xcframework in Frameworks */, + 031A7A582CD5F33600797180 /* FreeImage.xcframework in Frameworks */, + 031A7A5E2CD5F33C00797180 /* glfw.xcframework in Frameworks */, + 031A7A6C2CD5F34A00797180 /* uriparser.xcframework in Frameworks */, + 031A7A562CD5F33400797180 /* curl.xcframework in Frameworks */, + 031A7A662CD5F34200797180 /* pugixml.xcframework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - DACFA8C8132D09C7008D4B7A /* gl */ = { + BF5BF83E2B7378ED0049DEF6 /* frameworks */ = { isa = PBXGroup; children = ( - 694425151FE4544C00770088 /* ofGLBaseTypes.h */, - 2292E73C19E3049700DE9411 /* ofBufferObject.cpp */, - 2292E73D19E3049700DE9411 /* ofBufferObject.h */, - 2E498911292C96340096EC56 /* ofCubeMap.cpp */, - 2E498913292C96340096EC56 /* ofCubeMap.h */, - 2E498912292C96340096EC56 /* ofCubeMapShaders.h */, - 22246D91176C9987008A8AF4 /* ofGLProgrammableRenderer.cpp */, - 22246D92176C9987008A8AF4 /* ofGLProgrammableRenderer.h */, - DACFA8C9132D09E8008D4B7A /* ofFbo.cpp */, - DACFA8CA132D09E8008D4B7A /* ofFbo.h */, - DACFA8CB132D09E8008D4B7A /* ofGLRenderer.cpp */, - DACFA8CC132D09E8008D4B7A /* ofGLRenderer.h */, - 67D96B941651AF6D00D5242D /* ofGLUtils.cpp */, - DACFA8CD132D09E8008D4B7A /* ofGLUtils.h */, - DACFA8CE132D09E8008D4B7A /* ofLight.cpp */, - DACFA8CF132D09E8008D4B7A /* ofLight.h */, - 2E4D30C028F5BA9C0074D450 /* ofShadow.cpp */, - 2E4D30BF28F5BA9C0074D450 /* ofShadow.h */, - DACFA8D0132D09E8008D4B7A /* ofMaterial.cpp */, - DACFA8D1132D09E8008D4B7A /* ofMaterial.h */, - DACFA8D2132D09E8008D4B7A /* ofShader.cpp */, - DACFA8D3132D09E8008D4B7A /* ofShader.h */, - DACFA8D4132D09E8008D4B7A /* ofTexture.cpp */, - DACFA8D5132D09E8008D4B7A /* ofTexture.h */, - DACFA8D6132D09E8008D4B7A /* ofVbo.cpp */, - DACFA8D7132D09E8008D4B7A /* ofVbo.h */, - DACFA8D8132D09E8008D4B7A /* ofVboMesh.cpp */, - DACFA8D9132D09E8008D4B7A /* ofVboMesh.h */, + BF7C462D2C097CCE00461163 /* brotli.xcframework */, + BF6276A32BAD6639008864C1 /* curl.xcframework */, + BF6276A12BAD6619008864C1 /* openssl.xcframework */, + BF5BF8552B737E930049DEF6 /* pixman.xcframework */, + BF5BF8532B737E880049DEF6 /* libpng.xcframework */, + BF5BF8512B737E4E0049DEF6 /* glfw.xcframework */, + BF5BF84F2B737E440049DEF6 /* glew.xcframework */, + BF5BF84D2B737E3B0049DEF6 /* freetype.xcframework */, + BF5BF84B2B737E320049DEF6 /* FreeImage.xcframework */, + BF5BF8492B737E260049DEF6 /* cairo.xcframework */, + BF5BF8472B737D280049DEF6 /* pugixml.xcframework */, + BF5BF8452B737C870049DEF6 /* rtAudio.xcframework */, + BF5BF8432B737C7C0049DEF6 /* tess2.xcframework */, + BF5BF8412B737C700049DEF6 /* uriparser.xcframework */, + BF5BF83F2B737C0A0049DEF6 /* zlib.xcframework */, ); - name = gl; + name = frameworks; sourceTree = ""; }; - E4B27AAA10CBE92A00536013 /* openFrameworks */ = { - isa = PBXGroup; - children = ( - E4B27AC710CBE92A00536013 /* ofMain.h */, - E4F3BA5212F4C4BF002D19BB /* 3d */, - E4B27AAB10CBE92A00536013 /* app */, - E4B27AB210CBE92A00536013 /* communication */, - E4B27AB910CBE92A00536013 /* events */, - DACFA8C8132D09C7008D4B7A /* gl */, - E4F3BAFF12F4C751002D19BB /* graphics */, - E4F3BA7B12F4C4C9002D19BB /* sound */, - E4F3BAB212F4C72E002D19BB /* math */, - E4F3BACF12F4C73C002D19BB /* types */, - E4F3BAE212F4C745002D19BB /* utils */, - E4B27AD510CBE92A00536013 /* video */, - ); - name = openFrameworks; - path = ../../../openFrameworks; - sourceTree = SOURCE_ROOT; - }; - E4B27AAB10CBE92A00536013 /* app */ = { - isa = PBXGroup; - children = ( - 9979E81F1A1CCC44007E55D1 /* ofWindowSettings.h */, - 9979E8201A1CCC44007E55D1 /* ofMainLoop.cpp */, - 9979E8211A1CCC44007E55D1 /* ofMainLoop.h */, - E495DF7B178896A900994238 /* ofAppNoWindow.cpp */, - E495DF7C178896A900994238 /* ofAppNoWindow.h */, - 22FAD01C17049373002A7EB3 /* ofAppGLFWWindow.cpp */, - 22FAD01D17049373002A7EB3 /* ofAppGLFWWindow.h */, - E4B27AAC10CBE92A00536013 /* ofAppBaseWindow.h */, - E4B27AAF10CBE92A00536013 /* ofAppRunner.cpp */, - E4B27AB010CBE92A00536013 /* ofAppRunner.h */, - E4B27AB110CBE92A00536013 /* ofBaseApp.h */, - BBA81C421FFBE4DB0064EA94 /* ofBaseApp.cpp */, - ); - name = app; - path = ../../../openFrameworks/app; - sourceTree = SOURCE_ROOT; - }; - E4B27AB210CBE92A00536013 /* communication */ = { - isa = PBXGroup; - children = ( - E4B27AB310CBE92A00536013 /* ofArduino.cpp */, - E4B27AB410CBE92A00536013 /* ofArduino.h */, - E4B27AB510CBE92A00536013 /* ofSerial.cpp */, - E4B27AB610CBE92A00536013 /* ofSerial.h */, - ); - name = communication; - path = ../../../openFrameworks/communication; - sourceTree = SOURCE_ROOT; - }; - E4B27AB910CBE92A00536013 /* events */ = { - isa = PBXGroup; - children = ( - 229EB9A51B3181C800FF7B5F /* ofEvent.h */, - E4998A25128A39480094AC3F /* ofEvents.cpp */, - E4B27ABA10CBE92A00536013 /* ofEvents.h */, - E4B27ABB10CBE92A00536013 /* ofEventUtils.h */, - ); - name = events; - path = ../../../openFrameworks/events; - sourceTree = SOURCE_ROOT; - }; - E4B27AD510CBE92A00536013 /* video */ = { - isa = PBXGroup; - children = ( - 694425211FE456AF00770088 /* ofVideoBaseTypes.h */, - E4B27ADB10CBE92A00536013 /* ofVideoGrabber.cpp */, - E4B27ADC10CBE92A00536013 /* ofVideoGrabber.h */, - E4B27ADD10CBE92A00536013 /* ofVideoPlayer.cpp */, - E4B27ADE10CBE92A00536013 /* ofVideoPlayer.h */, - E48662991D8C61B000D1735C /* ofAVFoundationGrabber.mm */, - E48662981D8C61B000D1735C /* ofAVFoundationGrabber.h */, - 6766729F1A749D1900400051 /* ofAVFoundationVideoPlayer.h */, - 6766729D1A749D1900400051 /* ofAVFoundationVideoPlayer.m */, - 6766729E1A749D1900400051 /* ofAVFoundationPlayer.h */, - 676672A21A749D1900400051 /* ofAVFoundationPlayer.mm */, - ); - name = video; - path = ../../../openFrameworks/video; - sourceTree = SOURCE_ROOT; - }; E4B69B4A0A3A1720003C02F2 = { isa = PBXGroup; children = ( - E432815E138ABFDD0047C5CB /* Shared.xcconfig */, + 03EF25F52CD5D9C4005A5E4D /* openFrameworks */, E4EB6916138AFC8500A09F29 /* CoreOF.xcconfig */, + E432815E138ABFDD0047C5CB /* Shared.xcconfig */, E432815F138AC0470047C5CB /* Debug.xcconfig */, E4328160138AC04A0047C5CB /* Release.xcconfig */, - E4B27AAA10CBE92A00536013 /* openFrameworks */, E4B27C1510CBEB8E00536013 /* openFrameworksDebug.a */, + BF5BF83E2B7378ED0049DEF6 /* frameworks */, ); indentWidth = 4; sourceTree = ""; tabWidth = 4; - usesTabs = 0; - }; - E4F3BA5212F4C4BF002D19BB /* 3d */ = { - isa = PBXGroup; - children = ( - E4F3BA5312F4C4BF002D19BB /* of3dUtils.cpp */, - E4F3BA5412F4C4BF002D19BB /* of3dUtils.h */, - E4F3BA5512F4C4BF002D19BB /* ofCamera.cpp */, - E4F3BA5612F4C4BF002D19BB /* ofCamera.h */, - E4F3BA5712F4C4BF002D19BB /* ofEasyCam.cpp */, - E4F3BA5812F4C4BF002D19BB /* ofEasyCam.h */, - 6448E6FB1CAD7679000877BC /* ofMesh.inl */, - 53EEEF49130766EF0027C199 /* ofMesh.h */, - E4F3BA5F12F4C4BF002D19BB /* ofNode.cpp */, - E4F3BA6012F4C4BF002D19BB /* ofNode.h */, - 2E6EA7051603AABD00B7ADF3 /* of3dPrimitives.h */, - 2E6EA7071603AAD600B7ADF3 /* of3dPrimitives.cpp */, - ); - name = 3d; - path = ../../../openFrameworks/3d; - sourceTree = SOURCE_ROOT; - }; - E4F3BA7B12F4C4C9002D19BB /* sound */ = { - isa = PBXGroup; - children = ( - 6944251D1FE4548B00770088 /* ofSoundBaseTypes.cpp */, - 6944251E1FE4548B00770088 /* ofSoundBaseTypes.h */, - E4F3BA7E12F4C4C9002D19BB /* ofFmodSoundPlayer.cpp */, - E4F3BA7F12F4C4C9002D19BB /* ofFmodSoundPlayer.h */, - 772BDF71146928600030F0EE /* ofOpenALSoundPlayer.cpp */, - 772BDF72146928600030F0EE /* ofOpenALSoundPlayer.h */, - E4C5E386131AC1B10050F992 /* ofRtAudioSoundStream.cpp */, - E4C5E385131AC1B10050F992 /* ofRtAudioSoundStream.h */, - 6678E96D19FEAFA900C00581 /* ofSoundBuffer.cpp */, - 6678E96E19FEAFA900C00581 /* ofSoundBuffer.h */, - E4F3BA8212F4C4C9002D19BB /* ofSoundPlayer.cpp */, - E4F3BA8312F4C4C9002D19BB /* ofSoundPlayer.h */, - E4F3BA8412F4C4C9002D19BB /* ofSoundStream.cpp */, - E4F3BA8512F4C4C9002D19BB /* ofSoundStream.h */, - 6678E97C19FEB5A600C00581 /* ofSoundUtils.h */, - ); - name = sound; - path = ../../../openFrameworks/sound; - sourceTree = SOURCE_ROOT; - }; - E4F3BAB212F4C72E002D19BB /* math */ = { - isa = PBXGroup; - children = ( - 30CC5384207A36FD008234AF /* ofMathConstants.h */, - E4F3BAB312F4C72E002D19BB /* ofMath.cpp */, - E4F3BAB412F4C72E002D19BB /* ofMath.h */, - E4F3BAB512F4C72E002D19BB /* ofMatrix3x3.cpp */, - E4F3BAB612F4C72E002D19BB /* ofMatrix3x3.h */, - E4F3BAB712F4C72E002D19BB /* ofMatrix4x4.cpp */, - E4F3BAB812F4C72E002D19BB /* ofMatrix4x4.h */, - E4F3BAB912F4C72F002D19BB /* ofQuaternion.cpp */, - E4F3BABA12F4C72F002D19BB /* ofQuaternion.h */, - E4F3BABB12F4C72F002D19BB /* ofVec2f.cpp */, - E4F3BABC12F4C72F002D19BB /* ofVec2f.h */, - E4F3BABD12F4C72F002D19BB /* ofVec3f.h */, - E4F3BABE12F4C72F002D19BB /* ofVec4f.cpp */, - E4F3BABF12F4C72F002D19BB /* ofVec4f.h */, - E4F3BAC012F4C72F002D19BB /* ofVectorMath.h */, - ); - name = math; - path = ../../../openFrameworks/math; - sourceTree = SOURCE_ROOT; - }; - E4F3BACF12F4C73C002D19BB /* types */ = { - isa = PBXGroup; - children = ( - DAC22D3B16E7A4AF0020226D /* ofParameter.cpp */, - DAC22D3C16E7A4AF0020226D /* ofParameter.h */, - DAC22D3D16E7A4AF0020226D /* ofParameterGroup.cpp */, - DAC22D3E16E7A4AF0020226D /* ofParameterGroup.h */, - E4F3BAD012F4C73C002D19BB /* ofBaseTypes.cpp */, - E4F3BAD212F4C73C002D19BB /* ofColor.cpp */, - E4F3BAD312F4C73C002D19BB /* ofColor.h */, - E4F3BAD512F4C73C002D19BB /* ofPoint.h */, - E4F3BAD612F4C73C002D19BB /* ofRectangle.cpp */, - E4F3BAD712F4C73C002D19BB /* ofRectangle.h */, - E4F3BAD812F4C73C002D19BB /* ofTypes.h */, - ); - name = types; - path = ../../../openFrameworks/types; - sourceTree = SOURCE_ROOT; - }; - E4F3BAE212F4C745002D19BB /* utils */ = { - isa = PBXGroup; - children = ( - 692C298719DC5C5500C27C5D /* ofFpsCounter.cpp */, - 692C298819DC5C5500C27C5D /* ofFpsCounter.h */, - 692C298919DC5C5500C27C5D /* ofTimer.cpp */, - 692C298A19DC5C5500C27C5D /* ofTimer.h */, - 27DEA30F1796F578000A9E90 /* ofXml.cpp */, - 27DEA3101796F578000A9E90 /* ofXml.h */, - 2276958F170D9DD200604FC3 /* ofMatrixStack.cpp */, - 22769590170D9DD200604FC3 /* ofMatrixStack.h */, - E4F3BAE312F4C745002D19BB /* ofConstants.h */, - E4F3BAE412F4C745002D19BB /* ofFileUtils.cpp */, - E4F3BAE512F4C745002D19BB /* ofFileUtils.h */, - E4F3BAE612F4C745002D19BB /* ofLog.cpp */, - E4F3BAE712F4C745002D19BB /* ofLog.h */, - E4F3BAE812F4C745002D19BB /* ofNoise.h */, - E4F3BAE912F4C745002D19BB /* ofSystemUtils.cpp */, - E4F3BAEA12F4C745002D19BB /* ofSystemUtils.h */, - E4F3BAEB12F4C745002D19BB /* ofThread.cpp */, - E4F3BAEC12F4C745002D19BB /* ofThread.h */, - E4F3BAED12F4C745002D19BB /* ofURLFileLoader.cpp */, - E4F3BAEE12F4C745002D19BB /* ofURLFileLoader.h */, - E4F3BAEF12F4C745002D19BB /* ofUtils.cpp */, - E4F3BAF012F4C745002D19BB /* ofUtils.h */, - ); - name = utils; - path = ../../../openFrameworks/utils; - sourceTree = SOURCE_ROOT; - }; - E4F3BAFF12F4C751002D19BB /* graphics */ = { - isa = PBXGroup; - children = ( - 694425171FE4547400770088 /* ofGraphicsBaseTypes.cpp */, - 694425181FE4547400770088 /* ofGraphicsBaseTypes.h */, - 694425191FE4547400770088 /* ofGraphicsConstants.h */, - 92C55F86132DA7DD00EC2631 /* ofPath.cpp */, - 92C55F87132DA7DD00EC2631 /* ofPath.h */, - 6448E6FC1CAD771D000877BC /* ofPolyline.inl */, - DA48FE74131D85A6000062BC /* ofPolyline.h */, - DA94C2ED1301D32200CCC773 /* ofRendererCollection.h */, - 22A1C452170AFCB60079E473 /* ofRendererCollection.cpp */, - DA97FD3612F5A61A005C9991 /* ofCairoRenderer.cpp */, - DA97FD3712F5A61A005C9991 /* ofCairoRenderer.h */, - E4F3BB0012F4C751002D19BB /* ofBitmapFont.cpp */, - E4F3BB0112F4C751002D19BB /* ofBitmapFont.h */, - E4F3BB0412F4C752002D19BB /* ofGraphics.cpp */, - E4F3BB0512F4C752002D19BB /* ofGraphics.h */, - 19662F2D2834A44400B622ED /* ofGraphicsCairo.cpp */, - 19662F2C2834A44400B622ED /* ofGraphicsCairo.h */, - 2E6EA7031603AA7A00B7ADF3 /* of3dGraphics.cpp */, - 2E6EA7001603A9E400B7ADF3 /* of3dGraphics.h */, - E4F3BB0612F4C752002D19BB /* ofImage.cpp */, - E4F3BB0712F4C752002D19BB /* ofImage.h */, - E4F3BB0812F4C752002D19BB /* ofPixels.cpp */, - E4F3BB0912F4C752002D19BB /* ofPixels.h */, - E4F3BB1212F4C752002D19BB /* ofTessellator.cpp */, - E4F3BB1312F4C752002D19BB /* ofTessellator.h */, - E4F3BB1612F4C752002D19BB /* ofTrueTypeFont.cpp */, - E4F3BB1712F4C752002D19BB /* ofTrueTypeFont.h */, - ); - name = graphics; - path = ../../../openFrameworks/graphics; - sourceTree = SOURCE_ROOT; + usesTabs = 1; }; /* End PBXGroup section */ @@ -630,85 +169,6 @@ isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - 692C298E19DC5C5500C27C5D /* ofTimer.h in Headers */, - E4F3BA6812F4C4BF002D19BB /* of3dUtils.h in Headers */, - 30CC5385207A36FD008234AF /* ofMathConstants.h in Headers */, - E4F3BA6A12F4C4BF002D19BB /* ofCamera.h in Headers */, - E4F3BA6C12F4C4BF002D19BB /* ofEasyCam.h in Headers */, - E4F3BA7412F4C4BF002D19BB /* ofNode.h in Headers */, - E4F3BA8B12F4C4C9002D19BB /* ofFmodSoundPlayer.h in Headers */, - E4F3BA8F12F4C4C9002D19BB /* ofSoundPlayer.h in Headers */, - E4F3BA9112F4C4C9002D19BB /* ofSoundStream.h in Headers */, - E4F3BAC212F4C72F002D19BB /* ofMath.h in Headers */, - E4F3BAC412F4C72F002D19BB /* ofMatrix3x3.h in Headers */, - 676672A41A749D1900400051 /* ofAVFoundationPlayer.h in Headers */, - 6678E97019FEAFA900C00581 /* ofSoundBuffer.h in Headers */, - 9979E8241A1CCC44007E55D1 /* ofMainLoop.h in Headers */, - E4F3BAC612F4C72F002D19BB /* ofMatrix4x4.h in Headers */, - E4F3BAC812F4C72F002D19BB /* ofQuaternion.h in Headers */, - E4F3BACA12F4C72F002D19BB /* ofVec2f.h in Headers */, - E4F3BACB12F4C72F002D19BB /* ofVec3f.h in Headers */, - E4F3BACD12F4C72F002D19BB /* ofVec4f.h in Headers */, - 692C298C19DC5C5500C27C5D /* ofFpsCounter.h in Headers */, - E4F3BACE12F4C72F002D19BB /* ofVectorMath.h in Headers */, - 6678E97F19FEB5A600C00581 /* ofSoundUtils.h in Headers */, - 6944251B1FE4547400770088 /* ofGraphicsBaseTypes.h in Headers */, - E4F3BADC12F4C73C002D19BB /* ofColor.h in Headers */, - 694425161FE4544C00770088 /* ofGLBaseTypes.h in Headers */, - E4F3BADE12F4C73C002D19BB /* ofPoint.h in Headers */, - E4F3BAE012F4C73C002D19BB /* ofRectangle.h in Headers */, - 19662F2E2834A44400B622ED /* ofGraphicsCairo.h in Headers */, - E4F3BAE112F4C73C002D19BB /* ofTypes.h in Headers */, - 6944251C1FE4547400770088 /* ofGraphicsConstants.h in Headers */, - E4F3BAF112F4C745002D19BB /* ofConstants.h in Headers */, - E4F3BAF312F4C745002D19BB /* ofFileUtils.h in Headers */, - E4F3BAF512F4C745002D19BB /* ofLog.h in Headers */, - E4F3BAF612F4C745002D19BB /* ofNoise.h in Headers */, - E4F3BAF812F4C745002D19BB /* ofSystemUtils.h in Headers */, - E4F3BAFA12F4C745002D19BB /* ofThread.h in Headers */, - 694425221FE456AF00770088 /* ofVideoBaseTypes.h in Headers */, - E4F3BAFC12F4C745002D19BB /* ofURLFileLoader.h in Headers */, - E4F3BAFE12F4C745002D19BB /* ofUtils.h in Headers */, - E4F3BB1912F4C752002D19BB /* ofBitmapFont.h in Headers */, - 2E498915292C96340096EC56 /* ofCubeMapShaders.h in Headers */, - E4F3BB1D12F4C752002D19BB /* ofGraphics.h in Headers */, - E4F3BB1F12F4C752002D19BB /* ofImage.h in Headers */, - E4F3BB2112F4C752002D19BB /* ofPixels.h in Headers */, - E4F3BB2B12F4C752002D19BB /* ofTessellator.h in Headers */, - 2E498916292C96340096EC56 /* ofCubeMap.h in Headers */, - E4F3BB2F12F4C752002D19BB /* ofTrueTypeFont.h in Headers */, - DA97FD3D12F5A61A005C9991 /* ofCairoRenderer.h in Headers */, - DA94C2F01301D32200CCC773 /* ofRendererCollection.h in Headers */, - 53EEEF4B130766EF0027C199 /* ofMesh.h in Headers */, - DA48FE78131D85A6000062BC /* ofPolyline.h in Headers */, - DACFA8DB132D09E8008D4B7A /* ofFbo.h in Headers */, - DACFA8DD132D09E8008D4B7A /* ofGLRenderer.h in Headers */, - DACFA8DE132D09E8008D4B7A /* ofGLUtils.h in Headers */, - 694425201FE4548B00770088 /* ofSoundBaseTypes.h in Headers */, - DACFA8E0132D09E8008D4B7A /* ofLight.h in Headers */, - DACFA8E2132D09E8008D4B7A /* ofMaterial.h in Headers */, - DACFA8E4132D09E8008D4B7A /* ofShader.h in Headers */, - 676672A51A749D1900400051 /* ofAVFoundationVideoPlayer.h in Headers */, - DACFA8E6132D09E8008D4B7A /* ofTexture.h in Headers */, - DACFA8E8132D09E8008D4B7A /* ofVbo.h in Headers */, - DACFA8EA132D09E8008D4B7A /* ofVboMesh.h in Headers */, - 9979E8221A1CCC44007E55D1 /* ofWindowSettings.h in Headers */, - 92C55F89132DA7DD00EC2631 /* ofPath.h in Headers */, - E4C5E387131AC1B10050F992 /* ofRtAudioSoundStream.h in Headers */, - 772BDF74146928600030F0EE /* ofOpenALSoundPlayer.h in Headers */, - E486629A1D8C61B000D1735C /* ofAVFoundationGrabber.h in Headers */, - DAC22D4016E7A4AF0020226D /* ofParameter.h in Headers */, - DAC22D4216E7A4AF0020226D /* ofParameterGroup.h in Headers */, - 2E6EA7011603A9E400B7ADF3 /* of3dGraphics.h in Headers */, - 2292E73F19E3049700DE9411 /* ofBufferObject.h in Headers */, - 2E6EA7061603AABD00B7ADF3 /* of3dPrimitives.h in Headers */, - 229EB9A61B3181C800FF7B5F /* ofEvent.h in Headers */, - 22FAD01F17049373002A7EB3 /* ofAppGLFWWindow.h in Headers */, - 2E4D30C128F5BA9C0074D450 /* ofShadow.h in Headers */, - 22769592170D9DD200604FC3 /* ofMatrixStack.h in Headers */, - 22246D94176C9987008A8AF4 /* ofGLProgrammableRenderer.h in Headers */, - E495DF7E178896A900994238 /* ofAppNoWindow.h in Headers */, - 27DEA3121796F578000A9E90 /* ofXml.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -719,14 +179,19 @@ isa = PBXNativeTarget; buildConfigurationList = E4B27C3210CBEBB200536013 /* Build configuration list for PBXNativeTarget "openFrameworks" */; buildPhases = ( + BFEF3FA72C50AEC7009B3CD8 /* Run Script */, E4B27C1110CBEB8E00536013 /* Headers */, E4B27C1210CBEB8E00536013 /* Sources */, E4B27C1310CBEB8E00536013 /* Frameworks */, + BFF80A5D2C50B2C300784E74 /* ShellScript */, ); buildRules = ( ); dependencies = ( ); + fileSystemSynchronizedGroups = ( + 03EF25F52CD5D9C4005A5E4D /* openFrameworks */, + ); name = openFrameworks; productName = openFrameworksLib; productReference = E4B27C1510CBEB8E00536013 /* openFrameworksDebug.a */; @@ -738,7 +203,8 @@ E4B69B4C0A3A1720003C02F2 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0600; + BuildIndependentTargetsInParallel = YES; + LastUpgradeCheck = 1530; }; buildConfigurationList = E4B69B4D0A3A1720003C02F2 /* Build configuration list for PBXProject "openFrameworksLib" */; compatibilityVersion = "Xcode 3.2"; @@ -760,82 +226,53 @@ }; /* End PBXProject section */ +/* Begin PBXShellScriptBuildPhase section */ + BFEF3FA72C50AEC7009B3CD8 /* Run Script */ = { + isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + ); + name = "Run Script"; + outputFileListPaths = ( + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = "/usr/bin/env bash"; + shellScript = "#!/usr/bin/env bash\nif [ ! -d \"${SRCROOT}/../../../freetype/lib/macos/freetype.xcframework\" ]; then\n\techo \"openFrameworks has missing xcFrameworks for osx. Downloading libaries now via scripts/osx/download_libs.sh\"\n ${SRCROOT}/../../../../scripts/osx/download_libs.sh\nelse\n\techo \"xcFrameworks found\"\nfi\n"; + showEnvVarsInLog = 0; + }; + BFF80A5D2C50B2C300784E74 /* ShellScript */ = { + isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + ); + outputFileListPaths = ( + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "#!/bin/sh\nTARGET_DIR=\"$SRCROOT/../../lib/macos\"\nATTRIBUTE_CHECK=$(xattr -p com.apple.xcode.CreatedByBuildSystem \"$TARGET_DIR\" 2>/dev/null)\nif [ -z \"$ATTRIBUTE_CHECK\" ]; then\n xattr -w com.apple.xcode.CreatedByBuildSystem true \"$TARGET_DIR\"\n echo \"Attribute com.apple.xcode.CreatedByBuildSystem set to true for $TARGET_DIR\"\nelse\n echo \"Attribute com.apple.xcode.CreatedByBuildSystem already set for $TARGET_DIR\"\nfi\n"; + showEnvVarsInLog = 0; + }; +/* End PBXShellScriptBuildPhase section */ + /* Begin PBXSourcesBuildPhase section */ E4B27C1210CBEB8E00536013 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - E4B27C1910CBEB9D00536013 /* ofAppRunner.cpp in Sources */, - E4B27C1A10CBEB9D00536013 /* ofArduino.cpp in Sources */, - E4B27C1B10CBEB9D00536013 /* ofSerial.cpp in Sources */, - E4B27C2610CBEB9D00536013 /* ofVideoGrabber.cpp in Sources */, - E4B27C2710CBEB9D00536013 /* ofVideoPlayer.cpp in Sources */, - E4998A26128A39480094AC3F /* ofEvents.cpp in Sources */, - E4F3BA6712F4C4BF002D19BB /* of3dUtils.cpp in Sources */, - 6678E96F19FEAFA900C00581 /* ofSoundBuffer.cpp in Sources */, - E4F3BA6912F4C4BF002D19BB /* ofCamera.cpp in Sources */, - E4F3BA6B12F4C4BF002D19BB /* ofEasyCam.cpp in Sources */, - E4F3BA7312F4C4BF002D19BB /* ofNode.cpp in Sources */, - 6944251F1FE4548B00770088 /* ofSoundBaseTypes.cpp in Sources */, - 2292E73E19E3049700DE9411 /* ofBufferObject.cpp in Sources */, - E4F3BA8A12F4C4C9002D19BB /* ofFmodSoundPlayer.cpp in Sources */, - E4F3BA8E12F4C4C9002D19BB /* ofSoundPlayer.cpp in Sources */, - E4F3BA9012F4C4C9002D19BB /* ofSoundStream.cpp in Sources */, - E4F3BAC112F4C72F002D19BB /* ofMath.cpp in Sources */, - E4F3BAC312F4C72F002D19BB /* ofMatrix3x3.cpp in Sources */, - 6944251A1FE4547400770088 /* ofGraphicsBaseTypes.cpp in Sources */, - E4F3BAC512F4C72F002D19BB /* ofMatrix4x4.cpp in Sources */, - E4F3BAC712F4C72F002D19BB /* ofQuaternion.cpp in Sources */, - E4F3BAC912F4C72F002D19BB /* ofVec2f.cpp in Sources */, - E4F3BACC12F4C72F002D19BB /* ofVec4f.cpp in Sources */, - E4F3BAD912F4C73C002D19BB /* ofBaseTypes.cpp in Sources */, - 676672A31A749D1900400051 /* ofAVFoundationVideoPlayer.m in Sources */, - E4F3BADB12F4C73C002D19BB /* ofColor.cpp in Sources */, - E4F3BADF12F4C73C002D19BB /* ofRectangle.cpp in Sources */, - E4F3BAF212F4C745002D19BB /* ofFileUtils.cpp in Sources */, - 2E498914292C96340096EC56 /* ofCubeMap.cpp in Sources */, - E4F3BAF412F4C745002D19BB /* ofLog.cpp in Sources */, - BBA81C431FFBE4DB0064EA94 /* ofBaseApp.cpp in Sources */, - 9979E8231A1CCC44007E55D1 /* ofMainLoop.cpp in Sources */, - E4F3BAF712F4C745002D19BB /* ofSystemUtils.cpp in Sources */, - E4F3BAF912F4C745002D19BB /* ofThread.cpp in Sources */, - E4F3BAFB12F4C745002D19BB /* ofURLFileLoader.cpp in Sources */, - E4F3BAFD12F4C745002D19BB /* ofUtils.cpp in Sources */, - E4F3BB1812F4C752002D19BB /* ofBitmapFont.cpp in Sources */, - E4F3BB1C12F4C752002D19BB /* ofGraphics.cpp in Sources */, - 2E6EA7041603AA7A00B7ADF3 /* of3dGraphics.cpp in Sources */, - E4F3BB1E12F4C752002D19BB /* ofImage.cpp in Sources */, - E4F3BB2012F4C752002D19BB /* ofPixels.cpp in Sources */, - E4F3BB2A12F4C752002D19BB /* ofTessellator.cpp in Sources */, - E4F3BB2E12F4C752002D19BB /* ofTrueTypeFont.cpp in Sources */, - DA97FD3C12F5A61A005C9991 /* ofCairoRenderer.cpp in Sources */, - DACFA8DA132D09E8008D4B7A /* ofFbo.cpp in Sources */, - E486629B1D8C61B000D1735C /* ofAVFoundationGrabber.mm in Sources */, - DACFA8DC132D09E8008D4B7A /* ofGLRenderer.cpp in Sources */, - 2E4D30C228F5BA9C0074D450 /* ofShadow.cpp in Sources */, - 2E6EA7081603AAD600B7ADF3 /* of3dPrimitives.cpp in Sources */, - DACFA8DF132D09E8008D4B7A /* ofLight.cpp in Sources */, - 692C298D19DC5C5500C27C5D /* ofTimer.cpp in Sources */, - DACFA8E1132D09E8008D4B7A /* ofMaterial.cpp in Sources */, - DACFA8E3132D09E8008D4B7A /* ofShader.cpp in Sources */, - DACFA8E5132D09E8008D4B7A /* ofTexture.cpp in Sources */, - DACFA8E7132D09E8008D4B7A /* ofVbo.cpp in Sources */, - DACFA8E9132D09E8008D4B7A /* ofVboMesh.cpp in Sources */, - 92C55F88132DA7DD00EC2631 /* ofPath.cpp in Sources */, - E4C5E388131AC1B10050F992 /* ofRtAudioSoundStream.cpp in Sources */, - 772BDF73146928600030F0EE /* ofOpenALSoundPlayer.cpp in Sources */, - DAC22D3F16E7A4AF0020226D /* ofParameter.cpp in Sources */, - DAC22D4116E7A4AF0020226D /* ofParameterGroup.cpp in Sources */, - 67D96B971651AF6D00D5242D /* ofGLUtils.cpp in Sources */, - 22FAD01E17049373002A7EB3 /* ofAppGLFWWindow.cpp in Sources */, - 22A1C453170AFCB60079E473 /* ofRendererCollection.cpp in Sources */, - 22769591170D9DD200604FC3 /* ofMatrixStack.cpp in Sources */, - 22246D93176C9987008A8AF4 /* ofGLProgrammableRenderer.cpp in Sources */, - 676672A81A749D1900400051 /* ofAVFoundationPlayer.mm in Sources */, - E495DF7D178896A900994238 /* ofAppNoWindow.cpp in Sources */, - 27DEA3111796F578000A9E90 /* ofXml.cpp in Sources */, - 692C298B19DC5C5500C27C5D /* ofFpsCounter.cpp in Sources */, - 19662F2F2834A44400B622ED /* ofGraphicsCairo.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -845,9 +282,8 @@ E4B27C1610CBEB8E00536013 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - COMBINE_HIDPI_IMAGES = YES; - CONFIGURATION_BUILD_DIR = "$(SRCROOT)/../../lib/osx/"; - COPY_PHASE_STRIP = NO; + ARCHS = "$(ARCHS)"; + CONFIGURATION_BUILD_DIR = "$(SRCROOT)/../../lib/macos/"; EXECUTABLE_PREFIX = ""; INSTALL_PATH = /usr/local/lib; LIBRARY_SEARCH_PATHS = ( @@ -862,22 +298,19 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_8)", "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_9)", ); - OBJROOT = "$(SRCROOT)/../../lib/osx/build/debug/"; + OBJROOT = "$(SRCROOT)/../../lib/macos/build/debug/"; PRODUCT_NAME = openFrameworksDebug; SDKROOT = ""; - SKIP_INSTALL = YES; }; name = Debug; }; E4B27C1710CBEB8E00536013 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - COMBINE_HIDPI_IMAGES = YES; - CONFIGURATION_BUILD_DIR = "$(SRCROOT)/../../lib/osx/"; - COPY_PHASE_STRIP = YES; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ARCHS = "$(ARCHS)"; + CONFIGURATION_BUILD_DIR = "$(SRCROOT)/../../lib/macos/"; + DEBUG_INFORMATION_FORMAT = dwarf; EXECUTABLE_PREFIX = ""; - GCC_FAST_MATH = NO; INSTALL_PATH = /usr/local/lib; LIBRARY_SEARCH_PATHS = ( "$(inherited)", @@ -891,10 +324,9 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_8)", "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_9)", ); - OBJROOT = "$(SRCROOT)/../../lib/osx/build/release/"; + OBJROOT = "$(SRCROOT)/../../lib/macos/build/release/"; PRODUCT_NAME = openFrameworks; SDKROOT = ""; - SKIP_INSTALL = YES; }; name = Release; }; @@ -902,9 +334,14 @@ isa = XCBuildConfiguration; baseConfigurationReference = E432815F138AC0470047C5CB /* Debug.xcconfig */; buildSettings = { - CONFIGURATION_BUILD_DIR = "$(SRCROOT)/../../lib/osx/"; - CONFIGURATION_TEMP_DIR = "$(SRCROOT)/../../lib/osx/build/debug/"; - OBJROOT = "$(SRCROOT)/../../lib/osx/build/debug/"; + CONFIGURATION_BUILD_DIR = "$(SRCROOT)/../../lib/macos/"; + CONFIGURATION_TEMP_DIR = "$(SRCROOT)/../../lib/macos/build/debug/"; + DEFINES_MODULE = YES; + LD_WARN_DUPLICATE_LIBRARIES = YES; + LD_WARN_UNUSED_DYLIBS = YES; + MERGEABLE_LIBRARY = YES; + MERGED_BINARY_TYPE = automatic; + OBJROOT = "$(SRCROOT)/../../lib/macos/build/debug/"; ONLY_ACTIVE_ARCH = NO; SDKROOT = ""; }; @@ -914,9 +351,14 @@ isa = XCBuildConfiguration; baseConfigurationReference = E4328160138AC04A0047C5CB /* Release.xcconfig */; buildSettings = { - CONFIGURATION_BUILD_DIR = "$(SRCROOT)/../../lib/osx/"; - CONFIGURATION_TEMP_DIR = "$(SRCROOT)/../../lib/osx/build/release/"; - OBJROOT = "$(SRCROOT)/../../lib/osx/build/release"; + CONFIGURATION_BUILD_DIR = "$(SRCROOT)/../../lib/macos/"; + CONFIGURATION_TEMP_DIR = "$(SRCROOT)/../../lib/macos/build/release/"; + DEFINES_MODULE = YES; + LD_WARN_DUPLICATE_LIBRARIES = YES; + LD_WARN_UNUSED_DYLIBS = YES; + MERGEABLE_LIBRARY = YES; + MERGED_BINARY_TYPE = automatic; + OBJROOT = "$(SRCROOT)/../../lib/macos/build/release"; ONLY_ACTIVE_ARCH = NO; SDKROOT = ""; }; From 9bbc81f68999f973b0b7c5076b04cf76d0e6ec8c Mon Sep 17 00:00:00 2001 From: Dimitre Date: Sun, 3 Nov 2024 01:28:14 -0300 Subject: [PATCH 10/22] more --- addons/ofxKinect/src/ofxKinect.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/ofxKinect/src/ofxKinect.h b/addons/ofxKinect/src/ofxKinect.h index 23cc9f6cd10..b5c50c002d1 100644 --- a/addons/ofxKinect/src/ofxKinect.h +++ b/addons/ofxKinect/src/ofxKinect.h @@ -126,8 +126,8 @@ class ofxKinect : public ofxBase3DVideo, protected ofThread { /// calculates the coordinate in the world for the depth point (perspective calculation) /// /// center of image is (0.0) - ofVec3f getWorldCoordinateAt(int cx, int cy) const; - ofVec3f getWorldCoordinateAt(float cx, float cy, float wz) const; + glm::vec3 getWorldCoordinateAt(int cx, int cy) const; + glm::vec3 getWorldCoordinateAt(float cx, float cy, float wz) const; /// \section Intrinsic IR Sensor Parameters From aad5f9c60eeac4b527cdbdee0840bf7eeb485021 Mon Sep 17 00:00:00 2001 From: Dimitre Date: Sun, 3 Nov 2024 01:40:58 -0300 Subject: [PATCH 11/22] more updates --- .github/workflows/of.yml | 10 +++++----- libs/openFrameworks/math/ofVectorMath.h | 6 ++++++ 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.github/workflows/of.yml b/.github/workflows/of.yml index 9d1111df7db..a7856569301 100644 --- a/.github/workflows/of.yml +++ b/.github/workflows/of.yml @@ -168,7 +168,7 @@ jobs: # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - build-ios-tvos: - runs-on: macos-14 + runs-on: macos-15 strategy: matrix: cfg: @@ -191,7 +191,7 @@ jobs: run: ./scripts/ci/$TARGET/build.sh; env: - DEVELOPER_DIR: "/Applications/Xcode_15.4.app/Contents/Developer" + DEVELOPER_DIR: "/Applications/Xcode_16.1.app/Contents/Developer" # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -276,7 +276,7 @@ jobs: # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - build-macos: - runs-on: macos-14 + runs-on: macos-15 strategy: matrix: cfg: @@ -301,8 +301,8 @@ jobs: scripts/ci/${{ matrix.cfg.target }}/run_tests.sh; fi env: - DEVELOPER_DIR: "/Applications/Xcode_15.4.app/Contents/Developer" - SDKROOT: "/Applications/Xcode_15.4.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk" + DEVELOPER_DIR: "/Applications/Xcode_16.1.app/Contents/Developer" + SDKROOT: "/Applications/Xcode_16.1.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk" # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/libs/openFrameworks/math/ofVectorMath.h b/libs/openFrameworks/math/ofVectorMath.h index a2cead0b7bd..e52eb00e4bb 100644 --- a/libs/openFrameworks/math/ofVectorMath.h +++ b/libs/openFrameworks/math/ofVectorMath.h @@ -378,3 +378,9 @@ inline glm::vec2 & operator/=(glm::vec2 & v1, const ofVec2f & v2){ inline glm::vec3 operator+(const glm::vec3 & v1, const glm::vec4 & v2){ return v1 + glm::vec3(v2.x, v2.y, v2.z); } + +// addons/ofxGui/src/ofxButton.cpp:58:65 +//-------------------------------------------------------------- +inline glm::vec2 operator+(const glm::vec2 & v1, const glm::vec3 & v2){ + return v1 + glm::vec2(v2.x, v2.y); +} From 3efd14a007a024c27f7845cbb3fd16ae2de82a67 Mon Sep 17 00:00:00 2001 From: Dimitre Date: Sun, 3 Nov 2024 01:49:31 -0300 Subject: [PATCH 12/22] interop vec2 vec3 --- addons/ofxGui/src/ofxButton.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/ofxGui/src/ofxButton.cpp b/addons/ofxGui/src/ofxButton.cpp index 3e3ee871f5a..8c44c0bf27f 100644 --- a/addons/ofxGui/src/ofxButton.cpp +++ b/addons/ofxGui/src/ofxButton.cpp @@ -1,4 +1,5 @@ #include "ofxButton.h" +#include "ofVectorMath.h" // interop vec2 vec3 ofxButton::ofxButton(){ value.setSerializable(false); From bd7e5befbd90c6ccf6246204beed7de06bda2d26 Mon Sep 17 00:00:00 2001 From: Dimitre Date: Sun, 3 Nov 2024 01:50:28 -0300 Subject: [PATCH 13/22] updates --- addons/ofxOpenCv/src/ofxCvFloatImage.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/ofxOpenCv/src/ofxCvFloatImage.h b/addons/ofxOpenCv/src/ofxCvFloatImage.h index 135d01995da..920d6c0476b 100644 --- a/addons/ofxOpenCv/src/ofxCvFloatImage.h +++ b/addons/ofxOpenCv/src/ofxCvFloatImage.h @@ -128,10 +128,10 @@ class ofxCvFloatImage : public ofxCvImage { // float focalX, float focalY, // float centerX, float centerY ); //in base class // virtual void remap( IplImage* mapX, IplImage* mapY ); //in base class - // virtual void warpPerspective( ofPoint& A, ofPoint& B, - // ofPoint& C, ofPoint& D ); //in base class + // virtual void warpPerspective( glm::vec2& A, glm::vec2& B, + // glm::vec2& C, glm::vec2& D ); //in base class // virtual void warpIntoMe( ofxCvImage& mom, - // ofPoint src[4], ofPoint dst[4] ); //in base class + // glm::vec2 src[4], glm::vec2 dst[4] ); //in base class // Other Image Operations From fe3f2d49f98d0d0201cadb6fdb9ccb7bfa2aaf42 Mon Sep 17 00:00:00 2001 From: Dimitre Date: Sun, 3 Nov 2024 02:11:51 -0300 Subject: [PATCH 14/22] more fixes --- addons/ofxGui/src/ofxButton.cpp | 4 ++-- addons/ofxKinect/src/ofxKinect.cpp | 4 ++-- addons/ofxOpenCv/src/ofxCvBlob.h | 17 +++++++++++------ addons/ofxOpenCv/src/ofxCvContourFinder.cpp | 4 ++-- addons/ofxOpenCv/src/ofxCvImage.cpp | 2 +- 5 files changed, 18 insertions(+), 13 deletions(-) diff --git a/addons/ofxGui/src/ofxButton.cpp b/addons/ofxGui/src/ofxButton.cpp index 8c44c0bf27f..a9818de0099 100644 --- a/addons/ofxGui/src/ofxButton.cpp +++ b/addons/ofxGui/src/ofxButton.cpp @@ -56,14 +56,14 @@ void ofxButton::generateDraw(){ fg.setFilled(false); fg.setStrokeWidth(1); fg.setStrokeColor(thisFillColor); - fg.rectRounded(b.getPosition()+checkboxRect.getTopLeft()+glm::vec2{1,1},checkboxRect.width-2,checkboxRect.height-2, 5); + fg.rectRounded(b.getPosition()+checkboxRect.getTopLeft()+glm::vec3{1,1,0},checkboxRect.width-2,checkboxRect.height-2, 5); cross.clear(); cross.setStrokeColor(thisTextColor); cross.setFillColor(thisFillColor); cross.setStrokeWidth(2); cross.setFilled(true); - cross.rectRounded(b.getPosition()+checkboxRect.getTopLeft()+glm::vec2{1,1},checkboxRect.width-2,checkboxRect.height-2, 5); + cross.rectRounded(b.getPosition()+checkboxRect.getTopLeft()+glm::vec3{1,1,0},checkboxRect.width-2,checkboxRect.height-2, 5); std::string name; auto textX = b.x + textPadding + checkboxRect.width; diff --git a/addons/ofxKinect/src/ofxKinect.cpp b/addons/ofxKinect/src/ofxKinect.cpp index c564a914852..5cabca6d8ae 100644 --- a/addons/ofxKinect/src/ofxKinect.cpp +++ b/addons/ofxKinect/src/ofxKinect.cpp @@ -866,11 +866,11 @@ void ofxKinect::threadedFunction(){ freenect_raw_tilt_state * tilt = freenect_get_tilt_state(kinectDevice); currentTiltAngleDeg = freenect_get_tilt_degs(tilt); - rawAccel.set(tilt->accelerometer_x, tilt->accelerometer_y, tilt->accelerometer_z); + rawAccel = {tilt->accelerometer_x, tilt->accelerometer_y, tilt->accelerometer_z}; double dx,dy,dz; freenect_get_mks_accel(tilt, &dx, &dy, &dz); - mksAccel.set(dx, dy, dz); + mksAccel = {dx, dy, dz}; } // finish up a tilt on exit diff --git a/addons/ofxOpenCv/src/ofxCvBlob.h b/addons/ofxOpenCv/src/ofxCvBlob.h index fec526b34fe..70d7835952d 100644 --- a/addons/ofxOpenCv/src/ofxCvBlob.h +++ b/addons/ofxOpenCv/src/ofxCvBlob.h @@ -13,7 +13,6 @@ #include "ofxCvConstants.h" - class ofxCvBlob { public: @@ -21,10 +20,10 @@ class ofxCvBlob { float area; float length; ofRectangle boundingRect; - ofDefaultVec3 centroid; + ofDefaultVec2 centroid; bool hole; - std::vector pts; // the contour of the blob + std::vector pts; // the contour of the blob int nPts; // number of pts; //---------------------------------------- @@ -40,13 +39,19 @@ class ofxCvBlob { ofPushStyle(); ofNoFill(); ofSetHexColor(0x00FFFF); + ofPushMatrix(); + ofTranslate(x, y); ofBeginShape(); - for (int i = 0; i < nPts; i++){ - ofVertex(x + pts[i].x, y + pts[i].y); + for (const auto & p : pts) { + ofVertex(p); } + // for (int i = 0; i < nPts; i++){ + // ofVertex(pts[i].x, y pts[i].y); + // } ofEndShape(true); ofSetHexColor(0xff0099); - ofDrawRectangle(x + boundingRect.x, y + boundingRect.y, boundingRect.width, boundingRect.height); + ofDrawRectangle(boundingRect); + ofPopMatrix(); ofPopStyle(); } }; diff --git a/addons/ofxOpenCv/src/ofxCvContourFinder.cpp b/addons/ofxOpenCv/src/ofxCvContourFinder.cpp index d7ba1eb8a23..9c51d1ea8a5 100644 --- a/addons/ofxOpenCv/src/ofxCvContourFinder.cpp +++ b/addons/ofxOpenCv/src/ofxCvContourFinder.cpp @@ -130,7 +130,7 @@ int ofxCvContourFinder::findContours( ofxCvGrayscaleImage& input, for( int j=0; j < cvSeqBlobs[i]->total; j++ ) { CV_READ_SEQ_ELEM( pt, reader ); - blobs[i].pts.push_back( glm::vec2((float)pt.x, (float)pt.y) ); + blobs[i].pts.push_back( glm::vec3{(float)pt.x, (float)pt.y, 0.0f} ); } blobs[i].nPts = blobs[i].pts.size(); @@ -219,7 +219,7 @@ void ofxCvContourFinder::setAnchorPoint( float x, float y ){ //-------------------------------------------------------------------------------- void ofxCvContourFinder::resetAnchor(){ - anchor.set(0,0); + anchor = { 0, 0 }; bAnchorIsPct = false; } diff --git a/addons/ofxOpenCv/src/ofxCvImage.cpp b/addons/ofxOpenCv/src/ofxCvImage.cpp index 89b5c986497..083fb1104c0 100644 --- a/addons/ofxOpenCv/src/ofxCvImage.cpp +++ b/addons/ofxOpenCv/src/ofxCvImage.cpp @@ -485,7 +485,7 @@ void ofxCvImage::resetAnchor(){ if( bUseTexture ) { tex.resetAnchor(); }else{ - anchor.set(0,0); + anchor = { 0, 0 }; bAnchorIsPct = false; } } From 8dc896a91fa003c18286f4b9a17e6c98b81f69af Mon Sep 17 00:00:00 2001 From: Dimitre Date: Sun, 3 Nov 2024 02:28:23 -0300 Subject: [PATCH 15/22] node regression update --- tests/math/ofNodeRegressionTests/src/main.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/tests/math/ofNodeRegressionTests/src/main.cpp b/tests/math/ofNodeRegressionTests/src/main.cpp index f5cf7c9346d..221791cf3d0 100644 --- a/tests/math/ofNodeRegressionTests/src/main.cpp +++ b/tests/math/ofNodeRegressionTests/src/main.cpp @@ -86,7 +86,10 @@ class ofApp: public ofxUnitTestsApp{ mNode2.orbitDeg(angle, 0, 100, mNode); mNode1.dolly(100); - mNode1.rotateAround(ofQuaternion(angle, { 0.f,1.f,0.f }), mNode.getGlobalPosition()); + + glm::quat rot = glm::angleAxis(glm::radians(angle), glm::vec3(0.f, 1.f, 0.f)); + + mNode1.rotateAround(rot, mNode.getGlobalPosition()); auto pos1 = mNode1.getGlobalPosition(); auto pos2 = mNode2.getGlobalPosition(); @@ -103,7 +106,10 @@ class ofApp: public ofxUnitTestsApp{ ofNode n1; ofNode n2; n1.setGlobalPosition({ 100.f,0.f,0.f }); - n1.setGlobalOrientation(ofQuaternion(-90, { 0.f,-1.f,1.f })); + glm::quat rot = glm::angleAxis(glm::radians(-90.0f), glm::vec3(0.f, -1.f, 1.f)); + + // n1.setGlobalOrientation(ofQuaternion(-90, { 0.f,-1.f,1.f })); + n1.setGlobalOrientation(rot); n2.setParent(n1); n2.truck(50.f); auto pos = n2.getGlobalPosition(); From c33f0567852d4c67a81d4a5090ed2fe7e23134fc Mon Sep 17 00:00:00 2001 From: Dimitre Date: Sun, 3 Nov 2024 03:53:48 -0300 Subject: [PATCH 16/22] now passing tests --- libs/openFrameworks/math/ofQuaternion.cpp | 6 +++++- tests/math/ofNodeRegressionTests/src/main.cpp | 5 +++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/libs/openFrameworks/math/ofQuaternion.cpp b/libs/openFrameworks/math/ofQuaternion.cpp index 5317f617215..591fa3deaeb 100644 --- a/libs/openFrameworks/math/ofQuaternion.cpp +++ b/libs/openFrameworks/math/ofQuaternion.cpp @@ -24,6 +24,8 @@ void ofQuaternion::get(ofMatrix4x4& matrix) const { /// Set the elements of the Quat to represent a rotation of angle /// (degrees) around the axis (x,y,z) +/// + void ofQuaternion::makeRotate( float angle, float x, float y, float z ) { angle = glm::radians(angle); @@ -37,7 +39,9 @@ void ofQuaternion::makeRotate( float angle, float x, float y, float z ) { return; } - float inversenorm = 1.0f / length; + +// float inversenorm = 1.0f / length; + float inversenorm = 1.0f; float coshalfangle = cosf( 0.5f * angle ); float sinhalfangle = sinf( 0.5f * angle ); diff --git a/tests/math/ofNodeRegressionTests/src/main.cpp b/tests/math/ofNodeRegressionTests/src/main.cpp index 221791cf3d0..b7f1f1000a1 100644 --- a/tests/math/ofNodeRegressionTests/src/main.cpp +++ b/tests/math/ofNodeRegressionTests/src/main.cpp @@ -1,6 +1,7 @@ #include "ofMain.h" #include "ofxUnitTests.h" #include "ofAppNoWindow.h" +#include "ofQuaternion.h" bool aprox_eq(const glm::vec3 & v1, const glm::vec3 & v2){ @@ -87,7 +88,7 @@ class ofApp: public ofxUnitTestsApp{ mNode1.dolly(100); - glm::quat rot = glm::angleAxis(glm::radians(angle), glm::vec3(0.f, 1.f, 0.f)); + glm::quat rot = glm::angleAxis(glm::radians(angle), glm::normalize(glm::vec3(0.f, 1.f, 0.f))); mNode1.rotateAround(rot, mNode.getGlobalPosition()); @@ -106,7 +107,7 @@ class ofApp: public ofxUnitTestsApp{ ofNode n1; ofNode n2; n1.setGlobalPosition({ 100.f,0.f,0.f }); - glm::quat rot = glm::angleAxis(glm::radians(-90.0f), glm::vec3(0.f, -1.f, 1.f)); + glm::quat rot = glm::angleAxis(glm::radians(-90.0f), glm::normalize(glm::vec3(0.f, -1.f, 1.f))); // n1.setGlobalOrientation(ofQuaternion(-90, { 0.f,-1.f,1.f })); n1.setGlobalOrientation(rot); From 98803bac0b32880d8b186fb4990d528bb22262c3 Mon Sep 17 00:00:00 2001 From: Dimitre Date: Sun, 3 Nov 2024 08:00:28 -0300 Subject: [PATCH 17/22] ok! --- tests/math/quaternionTests/src/main.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/math/quaternionTests/src/main.cpp b/tests/math/quaternionTests/src/main.cpp index 8a8d9eeadad..7a63c42684e 100644 --- a/tests/math/quaternionTests/src/main.cpp +++ b/tests/math/quaternionTests/src/main.cpp @@ -2,7 +2,7 @@ #include "ofxUnitTests.h" #include "ofAppNoWindow.h" -bool aprox_eq(const ofVec3f & v1, const ofVec3f & v2){ +bool aprox_eq(const glm::vec3 & v1, const glm::vec3 & v2){ bool eq = abs(v1.x - v2.x) < 0.0001 && abs(v1.y - v2.y) < 0.0001 && abs(v1.z - v2.z) < 0.0001; @@ -16,10 +16,10 @@ bool aprox_eq(const ofVec3f & v1, const ofVec3f & v2){ class ofApp: public ofxUnitTestsApp{ public: void run(){ - ofQuaternion q1(30,ofVec3f(1,0,0)); - ofQuaternion q2(30,ofVec3f(0,0,1)); - ofQuaternion q3(30,ofVec3f(0,1,0)); - ofVec3f v(100,100,100); + glm::quat q1 = glm::angleAxis(glm::radians(30.0f),glm::normalize(glm::vec3(1,0,0))); + glm::quat q2 = glm::angleAxis(glm::radians(30.0f),glm::normalize(glm::vec3(0,0,1))); + glm::quat q3 = glm::angleAxis(glm::radians(30.0f),glm::normalize(glm::vec3(0,1,0))); + glm::vec3 v(100,100,100); auto q12 = q1 * q2; auto q13 = q1 * q3; auto q23 = q2 * q3; From 3e26119d746b506bd511f2cef50707b9c581c105 Mon Sep 17 00:00:00 2001 From: Dimitre Date: Sun, 3 Nov 2024 09:06:55 -0300 Subject: [PATCH 18/22] update examples and ios --- .../androidAdvanced3DExample/src/OrthoCamera.cpp | 8 +++++--- examples/android/androidTouchExample/src/Ball.h | 12 ++++++------ examples/events/rpiTouchExample/src/ofApp.cpp | 2 +- examples/gl/slowFastRenderingExample/src/ofApp.cpp | 2 +- examples/ios/ImagePickerExample/src/ofApp.h | 4 ++-- examples/ios/MapKitExample/src/ofApp.mm | 4 ++-- examples/ios/fontsExample/src/ofApp.h | 4 ++-- examples/ios/fontsExample/src/ofApp.mm | 2 +- examples/ios/iosCoreMotionCameraExample/src/ofApp.mm | 5 +++-- examples/ios/iosCoreMotionLegacyExample/src/Ball.h | 12 ++++++------ examples/ios/iosES2ShaderExample/src/ofApp.h | 2 +- examples/ios/iosES3ShaderExample/src/ofApp.h | 2 +- examples/ios/iosExternalDisplayExample/src/ofApp.mm | 12 ++++++------ examples/ios/iosOrientationExample/src/ofApp.mm | 12 ++++++------ examples/ios/xmlSettingsExample/src/ofApp.h | 2 +- examples/ios/xmlSettingsExample/src/ofApp.mm | 4 ++-- examples/math/trigonometryExample/README.md | 2 +- 17 files changed, 47 insertions(+), 44 deletions(-) diff --git a/examples/android/androidAdvanced3DExample/src/OrthoCamera.cpp b/examples/android/androidAdvanced3DExample/src/OrthoCamera.cpp index dd721e8dce6..262e5f7e4de 100644 --- a/examples/android/androidAdvanced3DExample/src/OrthoCamera.cpp +++ b/examples/android/androidAdvanced3DExample/src/OrthoCamera.cpp @@ -54,9 +54,11 @@ void OrthoCamera::begin(ofRectangle rect) glOrtho(-scalex, scalex, -scaley, scaley, -20 * scale, 20 * scale); #else // note that bottom and top are switched compared to glOrtho - ofMatrix4x4 ortho = ofMatrix4x4::newOrthoMatrix(-scalex, scalex, scaley, -scaley, - -20 * scale, 20 * scale); - glMultMatrixf(ortho.getPtr()); + // ofMatrix4x4 ortho = ofMatrix4x4::newOrthoMatrix(-scalex, scalex, scaley, -scaley, + // -20 * scale, 20 * scale); + // glMultMatrixf(ortho.getPtr()); + glm::mat4 ortho = glm::ortho(-scalex, scalex, scaley, -scaley, -20 * scale, 20 * scale); + glMultMatrixf(glm::value_ptr(ortho.getPtr())); #endif glMatrixMode(GL_MODELVIEW); // diff --git a/examples/android/androidTouchExample/src/Ball.h b/examples/android/androidTouchExample/src/Ball.h index 67d97be04ae..dc1b157619a 100644 --- a/examples/android/androidTouchExample/src/Ball.h +++ b/examples/android/androidTouchExample/src/Ball.h @@ -7,14 +7,14 @@ class Ball { public: - ofPoint pos; - ofPoint vel; + glm::vec2 pos; + glm::vec2 vel; ofColor col; bool touched; void init() { - pos.set(ofRandomWidth(), ofRandomHeight(), 0); - vel.set(ofRandomf(), ofRandomf(), 0); + pos = { ofRandomWidth(), ofRandomHeight(), 0 }; + vel = { ofRandomf(), ofRandomf(), 0 }; col.r = ofRandom(0, 255); col.g = ofRandom(0, 255); @@ -57,7 +57,7 @@ class Ball { } void moveTo(int x, int y) { - pos.set(x, y, 0); - vel.set(0, 0, 0); + pos = { x, y, 0 }; + vel = { 0, 0, 0 }; } }; diff --git a/examples/events/rpiTouchExample/src/ofApp.cpp b/examples/events/rpiTouchExample/src/ofApp.cpp index 8886cf2b1cc..36fcddcac15 100644 --- a/examples/events/rpiTouchExample/src/ofApp.cpp +++ b/examples/events/rpiTouchExample/src/ofApp.cpp @@ -73,7 +73,7 @@ void ofApp::mouseExited(int x, int y){ //-------------------------------------------------------------- void ofApp::touchDown(int x, int y, int id){ - touches[id] = ofVec2f(x, y); + touches[id] = glm::vec2(x, y); } //-------------------------------------------------------------- diff --git a/examples/gl/slowFastRenderingExample/src/ofApp.cpp b/examples/gl/slowFastRenderingExample/src/ofApp.cpp index 4f0bed72eeb..d15411c1123 100644 --- a/examples/gl/slowFastRenderingExample/src/ofApp.cpp +++ b/examples/gl/slowFastRenderingExample/src/ofApp.cpp @@ -71,7 +71,7 @@ void ofApp::draw() { ofMesh mesh; mesh.setMode(OF_PRIMITIVE_POINTS); for (unsigned int i=0; i Date: Sun, 3 Nov 2024 10:56:01 -0300 Subject: [PATCH 19/22] tidy up --- addons/ofxGui/src/ofxButton.cpp | 1 - addons/ofxGui/src/ofxGuiGroup.cpp | 42 ++++++---- addons/ofxGui/src/ofxGuiGroup.h | 8 +- addons/ofxGui/src/ofxSliderGroup.cpp | 35 ++++---- .../src/OrthoCamera.cpp | 3 - examples/events/rpiTouchExample/src/ofApp.h | 2 +- libs/openFrameworks/3d/ofNode.cpp | 14 +--- libs/openFrameworks/app/ofAppGLFWWindow.cpp | 2 - libs/openFrameworks/gl/ofShader.cpp | 16 ++-- libs/openFrameworks/gl/ofShader.h | 1 - libs/openFrameworks/gl/ofVbo.cpp | 84 ++++++++++--------- libs/openFrameworks/gl/ofVbo.h | 23 +++-- libs/openFrameworks/graphics/ofGraphics.cpp | 44 +++++----- libs/openFrameworks/graphics/ofGraphics.h | 12 ++- libs/openFrameworks/math/ofQuaternion.cpp | 6 +- libs/openFrameworks/math/ofVectorMath.h | 2 +- libs/openFrameworks/ofMain.h | 6 +- libs/openFrameworks/types/ofParameter.h | 46 +++++----- .../openFrameworks/types/ofParameterGroup.cpp | 8 +- tests/math/ofNodeRegressionTests/src/main.cpp | 2 - 20 files changed, 191 insertions(+), 166 deletions(-) diff --git a/addons/ofxGui/src/ofxButton.cpp b/addons/ofxGui/src/ofxButton.cpp index a9818de0099..5c05a0c9856 100644 --- a/addons/ofxGui/src/ofxButton.cpp +++ b/addons/ofxGui/src/ofxButton.cpp @@ -1,5 +1,4 @@ #include "ofxButton.h" -#include "ofVectorMath.h" // interop vec2 vec3 ofxButton::ofxButton(){ value.setSerializable(false); diff --git a/addons/ofxGui/src/ofxGuiGroup.cpp b/addons/ofxGui/src/ofxGuiGroup.cpp index 4476f1cafa5..abb3a00b7af 100644 --- a/addons/ofxGui/src/ofxGuiGroup.cpp +++ b/addons/ofxGui/src/ofxGuiGroup.cpp @@ -83,15 +83,19 @@ ofxGuiGroup * ofxGuiGroup::setup(const ofParameterGroup & _parameters, const str }else if(type == typeid(ofParameter ).name()){ auto p = _parameters.getVoid(i); add(p); - // }else if(type == typeid(ofParameter ).name()){ - // auto p = _parameters.get(i); - // add(p); - // }else if(type == typeid(ofParameter ).name()){ - // auto p = _parameters.get(i); - // add(p); - // }else if(type == typeid(ofParameter ).name()){ - // auto p = _parameters.get(i); - // add(p); +#ifdef OF_USE_LEGACY_MATH + + }else if(type == typeid(ofParameter ).name()){ + auto p = _parameters.get(i); + add(p); + }else if(type == typeid(ofParameter ).name()){ + auto p = _parameters.get(i); + add(p); + }else if(type == typeid(ofParameter ).name()){ + auto p = _parameters.get(i); + add(p); + +#endif }else if(type == typeid(ofParameter ).name()){ auto p = _parameters.get(i); add(p); @@ -173,17 +177,19 @@ void ofxGuiGroup::add(ofParameter & parameter){ add(createGuiElement >(parameter)); } -// void ofxGuiGroup::add(ofParameter & parameter){ -// add(createGuiElement >(parameter)); -// } +#ifdef OF_USE_LEGACY_MATH +void ofxGuiGroup::add(ofParameter & parameter){ + add(createGuiElement >(parameter)); +} -// void ofxGuiGroup::add(ofParameter & parameter){ -// add(createGuiElement >(parameter)); -// } +void ofxGuiGroup::add(ofParameter & parameter){ + add(createGuiElement >(parameter)); +} -// void ofxGuiGroup::add(ofParameter & parameter){ -// add(createGuiElement >(parameter)); -// } +void ofxGuiGroup::add(ofParameter & parameter){ + add(createGuiElement >(parameter)); +} +#endif void ofxGuiGroup::add(ofParameter & parameter){ add(createGuiElement >(parameter)); diff --git a/addons/ofxGui/src/ofxGuiGroup.h b/addons/ofxGui/src/ofxGuiGroup.h index 8c269ca0a61..f88306fc70b 100644 --- a/addons/ofxGui/src/ofxGuiGroup.h +++ b/addons/ofxGui/src/ofxGuiGroup.h @@ -32,9 +32,11 @@ class ofxGuiGroup : public ofxBaseGui { ownedCollection.emplace_back(std::make_unique(parameter)); add(ownedCollection.back().get()); } - // void add(ofParameter & parameter); - // void add(ofParameter & parameter); - // void add(ofParameter & parameter); +#ifdef OF_USE_LEGACY_MATH + void add(ofParameter & parameter); + void add(ofParameter & parameter); + void add(ofParameter & parameter); +#endif void add(ofParameter & parameter); void add(ofParameter & parameter); void add(ofParameter & parameter); diff --git a/addons/ofxGui/src/ofxSliderGroup.cpp b/addons/ofxGui/src/ofxSliderGroup.cpp index 5d68af1975f..63e232890f8 100644 --- a/addons/ofxGui/src/ofxSliderGroup.cpp +++ b/addons/ofxGui/src/ofxSliderGroup.cpp @@ -74,20 +74,22 @@ size_t ofxVecSlider_::dim(){ return 4; } -// template<> -// size_t ofxVecSlider_::dim(){ -// return 2; -// } +#ifdef OF_USE_LEGACY_MATH +template<> +size_t ofxVecSlider_::dim(){ + return 2; +} -// template<> -// size_t ofxVecSlider_::dim(){ -// return 3; -// } +template<> +size_t ofxVecSlider_::dim(){ + return 3; +} -// template<> -// size_t ofxVecSlider_::dim(){ -// return 4; -// } +template<> +size_t ofxVecSlider_::dim(){ + return 4; +} +#endif template ofAbstractParameter & ofxVecSlider_::getParameter(){ @@ -110,9 +112,12 @@ const VecType * ofxVecSlider_::operator->(){ return &value.get(); } -// template class ofxVecSlider_; -// template class ofxVecSlider_; -// template class ofxVecSlider_; +#ifdef OF_USE_LEGACY_MATH +template class ofxVecSlider_; +template class ofxVecSlider_; +template class ofxVecSlider_; +#endif + template class ofxVecSlider_; template class ofxVecSlider_; template class ofxVecSlider_; diff --git a/examples/android/androidAdvanced3DExample/src/OrthoCamera.cpp b/examples/android/androidAdvanced3DExample/src/OrthoCamera.cpp index 262e5f7e4de..cb6c4ba4a5c 100644 --- a/examples/android/androidAdvanced3DExample/src/OrthoCamera.cpp +++ b/examples/android/androidAdvanced3DExample/src/OrthoCamera.cpp @@ -54,9 +54,6 @@ void OrthoCamera::begin(ofRectangle rect) glOrtho(-scalex, scalex, -scaley, scaley, -20 * scale, 20 * scale); #else // note that bottom and top are switched compared to glOrtho - // ofMatrix4x4 ortho = ofMatrix4x4::newOrthoMatrix(-scalex, scalex, scaley, -scaley, - // -20 * scale, 20 * scale); - // glMultMatrixf(ortho.getPtr()); glm::mat4 ortho = glm::ortho(-scalex, scalex, scaley, -scaley, -20 * scale, 20 * scale); glMultMatrixf(glm::value_ptr(ortho.getPtr())); #endif diff --git a/examples/events/rpiTouchExample/src/ofApp.h b/examples/events/rpiTouchExample/src/ofApp.h index a0db59e993d..bbe0716475e 100644 --- a/examples/events/rpiTouchExample/src/ofApp.h +++ b/examples/events/rpiTouchExample/src/ofApp.h @@ -32,6 +32,6 @@ class ofApp : public ofBaseApp{ ofTrueTypeFont vagRounded; string timeString; - map touches; + map touches; }; diff --git a/libs/openFrameworks/3d/ofNode.cpp b/libs/openFrameworks/3d/ofNode.cpp index dd4cbb9e53c..1a9902381fd 100644 --- a/libs/openFrameworks/3d/ofNode.cpp +++ b/libs/openFrameworks/3d/ofNode.cpp @@ -1,13 +1,9 @@ -#define GLM_FORCE_CTOR_INIT -#define GLM_ENABLE_EXPERIMENTAL -//#define GLM_SWIZZLE -//#define GLM_SWIZZLE_XYZW - #include "ofNode.h" #include "of3dGraphics.h" +#define GLM_FORCE_CTOR_INIT +#define GLM_ENABLE_EXPERIMENTAL #include -//#include //---------------------------------------- ofNode::ofNode() @@ -638,7 +634,6 @@ void ofNode::orbitDeg(float longitude, float latitude, float radius, const glm:: p = q * p; // rotate p on unit sphere based on quaternion p = p * radius; // scale p by radius from its position on unit sphere -// setGlobalPosition(centerPoint + p.xyz()); setGlobalPosition(centerPoint + p); setOrientation(q); @@ -662,7 +657,6 @@ void ofNode::orbitRad(float longitude, float latitude, float radius, const glm:: p = q * p; // rotate p on unit sphere based on quaternion p = p * radius; // scale p by radius from its position on unit sphere -// setGlobalPosition(centerPoint + p.xyz()); setGlobalPosition(centerPoint + p); setOrientation(q); @@ -715,8 +709,8 @@ void ofNode::restoreTransformGL(ofBaseRenderer * renderer) const { //---------------------------------------- void ofNode::createMatrix() { - glm::vec3 pos = position; - glm::vec3 scl = scale; + glm::vec3 pos { position }; + glm::vec3 scl { scale }; localTransformMatrix = glm::translate(glm::mat4(1.0), pos); localTransformMatrix = localTransformMatrix * glm::toMat4((const glm::quat&)orientation); diff --git a/libs/openFrameworks/app/ofAppGLFWWindow.cpp b/libs/openFrameworks/app/ofAppGLFWWindow.cpp index 2cd140153d4..246e40b6c3a 100644 --- a/libs/openFrameworks/app/ofAppGLFWWindow.cpp +++ b/libs/openFrameworks/app/ofAppGLFWWindow.cpp @@ -141,10 +141,8 @@ void ofAppGLFWWindow::setup(const ofGLESWindowSettings & settings) { #endif const ofGLFWWindowSettings * glSettings = dynamic_cast(&settings); if (glSettings) { - std::cout << "FEIO 1" << std::endl; setup(*glSettings); } else { - std::cout << "FEIO 2" << std::endl; setup(ofGLFWWindowSettings(settings)); } } diff --git a/libs/openFrameworks/gl/ofShader.cpp b/libs/openFrameworks/gl/ofShader.cpp index d3eb77c8dfa..719b4a85b7c 100644 --- a/libs/openFrameworks/gl/ofShader.cpp +++ b/libs/openFrameworks/gl/ofShader.cpp @@ -1148,13 +1148,15 @@ void ofShader::setUniforms(const ofParameterGroup & parameters) const { } else if (parameters[i].type() == typeid(ofParameter).name()) { setUniform4f(parameters[i].getEscapedName(), parameters[i].cast()); } - // else if (parameters[i].type() == typeid(ofParameter).name()) { - // setUniform2f(parameters[i].getEscapedName(), parameters[i].cast()); - // } else if (parameters[i].type() == typeid(ofParameter).name()) { - // setUniform3f(parameters[i].getEscapedName(), parameters[i].cast()); - // } else if (parameters[i].type() == typeid(ofParameter).name()) { - // setUniform4f(parameters[i].getEscapedName(), parameters[i].cast()); - // } +#ifdef OF_USE_LEGACY_MATH + else if (parameters[i].type() == typeid(ofParameter).name()) { + setUniform2f(parameters[i].getEscapedName(), parameters[i].cast()); + } else if (parameters[i].type() == typeid(ofParameter).name()) { + setUniform3f(parameters[i].getEscapedName(), parameters[i].cast()); + } else if (parameters[i].type() == typeid(ofParameter).name()) { + setUniform4f(parameters[i].getEscapedName(), parameters[i].cast()); + } +#endif else if (parameters[i].type() == typeid(ofParameterGroup).name()) { setUniforms((ofParameterGroup &)parameters[i]); } diff --git a/libs/openFrameworks/gl/ofShader.h b/libs/openFrameworks/gl/ofShader.h index eb71444e3fc..930d4d38651 100644 --- a/libs/openFrameworks/gl/ofShader.h +++ b/libs/openFrameworks/gl/ofShader.h @@ -25,7 +25,6 @@ namespace glm { class ofTexture; class ofTextureData; -//class ofMatrix3x3; class ofParameterGroup; class ofBufferObject; class ofBaseHasTexture; diff --git a/libs/openFrameworks/gl/ofVbo.cpp b/libs/openFrameworks/gl/ofVbo.cpp index 198b1dcdda1..1d15689f053 100644 --- a/libs/openFrameworks/gl/ofVbo.cpp +++ b/libs/openFrameworks/gl/ofVbo.cpp @@ -326,21 +326,11 @@ void ofVbo::setVertexData(const glm::vec3 * verts, int total, int usage) { setVertexData(&verts[0].x,3,total,usage,sizeof(glm::vec3)); } -//-------------------------------------------------------------- -//void ofVbo::setVertexData(const ofVec3f * verts, int total, int usage) { -// setVertexData(&verts[0].x,3,total,usage,sizeof(glm::vec3)); -//} - //-------------------------------------------------------------- void ofVbo::setVertexData(const glm::vec2 * verts, int total, int usage) { setVertexData(&verts[0].x,2,total,usage,sizeof(glm::vec2)); } -//-------------------------------------------------------------- -//void ofVbo::setVertexData(const ofVec2f * verts, int total, int usage) { -// setVertexData(&verts[0].x,2,total,usage,sizeof(glm::vec2)); -//} - //-------------------------------------------------------------- void ofVbo::setVertexData(const float * vert0x, int numCoords, int total, int usage, int stride) { positionAttribute.setData(vert0x, numCoords, total, usage, stride); @@ -364,11 +354,6 @@ void ofVbo::setNormalData(const glm::vec3 * normals, int total, int usage) { setNormalData(&normals[0].x,total,usage,sizeof(glm::vec3)); } -//-------------------------------------------------------------- -//void ofVbo::setNormalData(const ofVec3f * normals, int total, int usage) { -// setNormalData(&normals[0].x,total,usage,sizeof(glm::vec3)); -//} - //-------------------------------------------------------------- void ofVbo::setNormalData(const float * normal0x, int total, int usage, int stride) { normalAttribute.setData(normal0x, 3, total, usage, stride); @@ -380,11 +365,6 @@ void ofVbo::setTexCoordData(const glm::vec2 * texCoords, int total, int usage) { setTexCoordData(&texCoords[0].x,total, usage, sizeof(glm::vec2)); } -//-------------------------------------------------------------- -//void ofVbo::setTexCoordData(const ofVec2f * texCoords, int total, int usage) { -// setTexCoordData(&texCoords[0].x,total, usage, sizeof(glm::vec2)); -//} - //-------------------------------------------------------------- void ofVbo::setTexCoordData(const float * texCoord0x, int total, int usage, int stride) { texCoordAttribute.setData(texCoord0x, 2, total, usage, stride); @@ -402,6 +382,28 @@ void ofVbo::setIndexData(const ofIndexType * indices, int total, int usage){ indexAttribute.setData(sizeof(ofIndexType) * total, &indices[0], usage); } +#ifdef OF_USE_LEGACY_MATH +//-------------------------------------------------------------- +void ofVbo::setVertexData(const ofVec3f * verts, int total, int usage) { + setVertexData(&verts[0].x,3,total,usage,sizeof(glm::vec3)); +} + +//-------------------------------------------------------------- +void ofVbo::setVertexData(const ofVec2f * verts, int total, int usage) { + setVertexData(&verts[0].x,2,total,usage,sizeof(glm::vec2)); +} + +//-------------------------------------------------------------- +void ofVbo::setNormalData(const ofVec3f * normals, int total, int usage) { + setNormalData(&normals[0].x,total,usage,sizeof(glm::vec3)); +} + +//-------------------------------------------------------------- +void ofVbo::setTexCoordData(const ofVec2f * texCoords, int total, int usage) { + setTexCoordData(&texCoords[0].x,total, usage, sizeof(glm::vec2)); +} +#endif + //-------------------------------------------------------------- ofVbo::VertexAttribute & ofVbo::getOrCreateAttr(int location){ VertexAttribute * attr = nullptr; @@ -471,21 +473,11 @@ void ofVbo::updateVertexData(const glm::vec3 * verts, int total) { updateVertexData(&verts[0].x,total); } -//-------------------------------------------------------------- -//void ofVbo::updateVertexData(const ofVec3f * verts, int total) { -// updateVertexData(&verts[0].x,total); -//} - //-------------------------------------------------------------- void ofVbo::updateVertexData(const glm::vec2 * verts, int total) { updateVertexData(&verts[0].x,total); } -//-------------------------------------------------------------- -//void ofVbo::updateVertexData(const ofVec2f * verts, int total) { -// updateVertexData(&verts[0].x,total); -//} - //-------------------------------------------------------------- void ofVbo::updateVertexData(const float * vert0x, int total) { positionAttribute.updateData(0, total * positionAttribute.stride, vert0x); @@ -506,11 +498,6 @@ void ofVbo::updateNormalData(const glm::vec3 * normals, int total) { updateNormalData(&normals[0].x,total); } -//-------------------------------------------------------------- -//void ofVbo::updateNormalData(const ofVec3f * normals, int total) { -// updateNormalData(&normals[0].x,total); -//} - //-------------------------------------------------------------- void ofVbo::updateNormalData(const float * normal0x, int total) { normalAttribute.updateData(0, total * normalAttribute.stride, normal0x); @@ -521,11 +508,6 @@ void ofVbo::updateTexCoordData(const glm::vec2 * texCoords, int total) { updateTexCoordData(&texCoords[0].x,total); } -//-------------------------------------------------------------- -//void ofVbo::updateTexCoordData(const ofVec2f * texCoords, int total) { -// updateTexCoordData(&texCoords[0].x,total); -//} - //-------------------------------------------------------------- void ofVbo::updateTexCoordData(const float * texCoord0x, int total) { texCoordAttribute.updateData(0, total * texCoordAttribute.stride, texCoord0x); @@ -538,6 +520,28 @@ void ofVbo::updateIndexData(const ofIndexType * indices, int total) { } } +#ifdef OF_USE_LEGACY_MATH +//-------------------------------------------------------------- +void ofVbo::updateVertexData(const ofVec3f * verts, int total) { + updateVertexData(&verts[0].x,total); +} + +//-------------------------------------------------------------- +void ofVbo::updateVertexData(const ofVec2f * verts, int total) { + updateVertexData(&verts[0].x,total); +} + +//-------------------------------------------------------------- +void ofVbo::updateNormalData(const ofVec3f * normals, int total) { + updateNormalData(&normals[0].x,total); +} + +//-------------------------------------------------------------- +void ofVbo::updateTexCoordData(const ofVec2f * texCoords, int total) { + updateTexCoordData(&texCoords[0].x,total); +} +#endif + void ofVbo::updateAttributeData(int location, const float * attr0x, int total){ VertexAttribute * attr = nullptr; if (ofIsGLProgrammableRenderer()) { diff --git a/libs/openFrameworks/gl/ofVbo.h b/libs/openFrameworks/gl/ofVbo.h index 07cb14ef991..ada27871b58 100644 --- a/libs/openFrameworks/gl/ofVbo.h +++ b/libs/openFrameworks/gl/ofVbo.h @@ -28,16 +28,18 @@ class ofVbo { void setVertexData(const glm::vec3 * verts, int total, int usage); void setVertexData(const glm::vec2 * verts, int total, int usage); -// void setVertexData(const ofVec3f * verts, int total, int usage); -// void setVertexData(const ofVec2f * verts, int total, int usage); void setColorData(const ofFloatColor * colors, int total, int usage); void setNormalData(const glm::vec3 * normals, int total, int usage); -// void setNormalData(const ofVec3f * normals, int total, int usage); void setTexCoordData(const glm::vec2 * texCoords, int total, int usage); -// void setTexCoordData(const ofVec2f * texCoords, int total, int usage); void setIndexData(const ofIndexType * indices, int total, int usage); +#ifdef OF_USE_LEGACY_MATH + void setVertexData(const ofVec3f * verts, int total, int usage); + void setVertexData(const ofVec2f * verts, int total, int usage); + void setNormalData(const ofVec3f * normals, int total, int usage); + void setTexCoordData(const ofVec2f * texCoords, int total, int usage); +#endif void setVertexData(const float * vert0x, int numCoords, int total, int usage, int stride=0); void setColorData(const float * color0r, int total, int usage, int stride=0); void setNormalData(const float * normal0x, int total, int usage, int stride=0); @@ -81,15 +83,18 @@ class ofVbo { void updateVertexData(const glm::vec3 * verts, int total); void updateVertexData(const glm::vec2 * verts, int total); -// void updateVertexData(const ofVec3f * verts, int total); -// void updateVertexData(const ofVec2f * verts, int total); void updateColorData(const ofFloatColor * colors, int total); void updateNormalData(const glm::vec3 * normals, int total); -// void updateNormalData(const ofVec3f * normals, int total); void updateTexCoordData(const glm::vec2 * texCoords, int total); -// void updateTexCoordData(const ofVec2f * texCoords, int total); void updateIndexData(const ofIndexType * indices, int total); - + +#ifdef OF_USE_LEGACY_MATH + void updateVertexData(const ofVec3f * verts, int total); + void updateVertexData(const ofVec2f * verts, int total); + void updateNormalData(const ofVec3f * normals, int total); + void updateTexCoordData(const ofVec2f * texCoords, int total); +#endif + void updateVertexData(const float * ver0x, int total); void updateColorData(const float * color0r, int total); void updateNormalData(const float * normal0x, int total); diff --git a/libs/openFrameworks/graphics/ofGraphics.cpp b/libs/openFrameworks/graphics/ofGraphics.cpp index bb726b89382..cd582deafb1 100644 --- a/libs/openFrameworks/graphics/ofGraphics.cpp +++ b/libs/openFrameworks/graphics/ofGraphics.cpp @@ -1120,19 +1120,21 @@ void ofVertices(const vector & polyPoints) { } } +#ifdef OF_USE_LEGACY_MATH //---------------------------------------------------------- -//void ofVertices(const vector & polyPoints) { -// for (const auto & p : polyPoints) { -// ofGetCurrentRenderer()->getPath().lineTo(p); -// } -//} +void ofVertices(const vector & polyPoints) { + for (const auto & p : polyPoints) { + ofGetCurrentRenderer()->getPath().lineTo(p); + } +} //---------------------------------------------------------- -//void ofVertices(const vector & polyPoints) { -// for (const auto & p : polyPoints) { -// ofGetCurrentRenderer()->getPath().lineTo(p); -// } -//} +void ofVertices(const vector & polyPoints) { + for (const auto & p : polyPoints) { + ofGetCurrentRenderer()->getPath().lineTo(p); + } +} +#endif //--------------------------------------------------- void ofCurveVertex(float x, float y) { @@ -1158,19 +1160,21 @@ void ofCurveVertices(const vector & curvePoints) { } } +#ifdef OF_USE_LEGACY_MATH //---------------------------------------------------------- -//void ofCurveVertices(const vector & curvePoints) { -// for (const auto & p : curvePoints) { -// ofGetCurrentRenderer()->getPath().curveTo(p); -// } -//} +void ofCurveVertices(const vector & curvePoints) { + for (const auto & p : curvePoints) { + ofGetCurrentRenderer()->getPath().curveTo(p); + } +} //---------------------------------------------------------- -//void ofCurveVertices(const vector & curvePoints) { -// for (const auto & p : curvePoints) { -// ofGetCurrentRenderer()->getPath().curveTo(p); -// } -//} +void ofCurveVertices(const vector & curvePoints) { + for (const auto & p : curvePoints) { + ofGetCurrentRenderer()->getPath().curveTo(p); + } +} +#endif //--------------------------------------------------- void ofCurveVertex(const glm::vec3 & p) { diff --git a/libs/openFrameworks/graphics/ofGraphics.h b/libs/openFrameworks/graphics/ofGraphics.h index 16a4924f6b6..cef766d843b 100644 --- a/libs/openFrameworks/graphics/ofGraphics.h +++ b/libs/openFrameworks/graphics/ofGraphics.h @@ -599,8 +599,10 @@ void ofVertex(const glm::vec3 & p); void ofVertex(const glm::vec2 & p); void ofVertices(const std::vector & polyPoints); void ofVertices(const std::vector & polyPoints); -//void ofVertices(const std::vector & polyPoints); -//void ofVertices(const std::vector & polyPoints); +#ifdef OF_USE_LEGACY_MATH +void ofVertices(const std::vector & polyPoints); +void ofVertices(const std::vector & polyPoints); +#endif /// \brief Specifies a single point of a shape. The difference from ofVertex is that /// the line describing the edge of the shape between two points will be a @@ -617,8 +619,10 @@ void ofCurveVertex(const glm::vec2 & p); /// ofPoints. Should be called between ofBeginShape() and ofEndShape(). void ofCurveVertices(const std::vector & curvePoints); void ofCurveVertices(const std::vector & curvePoints); -//void ofCurveVertices(const std::vector & curvePoints); -//void ofCurveVertices(const std::vector & curvePoints); +#ifdef OF_USE_LEGACY_MATH +void ofCurveVertices(const std::vector & curvePoints); +void ofCurveVertices(const std::vector & curvePoints); +#endif /// \brief Describes a bezier curve through three points of a shape. To be called /// between ofBeginShape() and ofEndShape(). diff --git a/libs/openFrameworks/math/ofQuaternion.cpp b/libs/openFrameworks/math/ofQuaternion.cpp index 591fa3deaeb..5317f617215 100644 --- a/libs/openFrameworks/math/ofQuaternion.cpp +++ b/libs/openFrameworks/math/ofQuaternion.cpp @@ -24,8 +24,6 @@ void ofQuaternion::get(ofMatrix4x4& matrix) const { /// Set the elements of the Quat to represent a rotation of angle /// (degrees) around the axis (x,y,z) -/// - void ofQuaternion::makeRotate( float angle, float x, float y, float z ) { angle = glm::radians(angle); @@ -39,9 +37,7 @@ void ofQuaternion::makeRotate( float angle, float x, float y, float z ) { return; } - -// float inversenorm = 1.0f / length; - float inversenorm = 1.0f; + float inversenorm = 1.0f / length; float coshalfangle = cosf( 0.5f * angle ); float sinhalfangle = sinf( 0.5f * angle ); diff --git a/libs/openFrameworks/math/ofVectorMath.h b/libs/openFrameworks/math/ofVectorMath.h index e52eb00e4bb..c4e2f28bfb5 100644 --- a/libs/openFrameworks/math/ofVectorMath.h +++ b/libs/openFrameworks/math/ofVectorMath.h @@ -198,7 +198,7 @@ namespace glm { -#ifdef OF_LEGACY_MATH_WOW +#ifdef OF_USE_LEGACY_MATH class ofMatrix3x3; #include "ofMatrix4x4.h" diff --git a/libs/openFrameworks/ofMain.h b/libs/openFrameworks/ofMain.h index 9339f01e4df..9cf35e2255a 100644 --- a/libs/openFrameworks/ofMain.h +++ b/libs/openFrameworks/ofMain.h @@ -23,14 +23,16 @@ #include "ofColor.h" #include "ofGraphicsBaseTypes.h" #include "ofParameter.h" -//#include "ofPoint.h" +#ifdef OF_USE_LEGACY_MATH +#include "ofPoint.h" +#endif #include "ofRectangle.h" #include "ofTypes.h" //-------------------------- // math #include "ofMath.h" -//#include "ofVectorMath.h" +#include "ofVectorMath.h" //-------------------------- // communication diff --git a/libs/openFrameworks/types/ofParameter.h b/libs/openFrameworks/types/ofParameter.h index 7821872f67d..3fcfae34b0e 100644 --- a/libs/openFrameworks/types/ofParameter.h +++ b/libs/openFrameworks/types/ofParameter.h @@ -1,16 +1,12 @@ #pragma once -#include - #include "ofEvents.h" -// FIXME: crossed references. ofPoint adds ofVec3f which adds ofVec2f and ofVec4f -//#include "ofPoint.h" - #include "ofColor.h" #include "ofLog.h" #include "ofMathConstants.h" #include "ofRectangle.h" #include "ofUtils.h" // ofToString +#include #ifdef TARGET_WIN32 #include @@ -128,7 +124,9 @@ class ofParameterGroup : public ofAbstractParameter { const ofParameter & getFloat(const std::string & name) const; const ofParameter & getChar(const std::string & name) const; const ofParameter & getString(const std::string & name) const; -// const ofParameter & getPoint(const std::string & name) const; +#ifdef OF_USE_LEGACY_MATH + const ofParameter & getPoint(const std::string & name) const; +#endif const ofParameter & getVec2f(const std::string & name) const; const ofParameter & getVec3f(const std::string & name) const; const ofParameter & getVec4f(const std::string & name) const; @@ -144,7 +142,9 @@ class ofParameterGroup : public ofAbstractParameter { const ofParameter & getFloat(std::size_t pos) const; const ofParameter & getChar(std::size_t pos) const; const ofParameter & getString(std::size_t pos) const; -// const ofParameter & getPoint(std::size_t pos) const; +#ifdef OF_USE_LEGACY_MATH + const ofParameter & getPoint(std::size_t pos) const; +#endif const ofParameter & getVec2f(std::size_t pos) const; const ofParameter & getVec3f(std::size_t pos) const; const ofParameter & getVec4f(std::size_t pos) const; @@ -160,7 +160,9 @@ class ofParameterGroup : public ofAbstractParameter { ofParameter & getFloat(const std::string & name); ofParameter & getChar(const std::string & name); ofParameter & getString(const std::string & name); -// ofParameter & getPoint(const std::string & name); +#ifdef OF_USE_LEGACY_MATH + ofParameter & getPoint(const std::string & name); +#endif ofParameter & getVec2f(const std::string & name); ofParameter & getVec3f(const std::string & name); ofParameter & getVec4f(const std::string & name); @@ -176,7 +178,9 @@ class ofParameterGroup : public ofAbstractParameter { ofParameter & getFloat(std::size_t pos); ofParameter & getChar(std::size_t pos); ofParameter & getString(std::size_t pos); -// ofParameter & getPoint(std::size_t pos); +#ifdef OF_USE_LEGACY_MATH + ofParameter & getPoint(std::size_t pos); +#endif ofParameter & getVec2f(std::size_t pos); ofParameter & getVec3f(std::size_t pos); ofParameter & getVec4f(std::size_t pos); @@ -380,12 +384,14 @@ template struct TypeInfo : public of::priv::TypeInfo_::is_specialized> { }; +#ifdef OF_USE_LEGACY_MATH // Here we provide some of our own specializations: -//template <> -//struct TypeInfo { -// static ofVec2f min() { return ofVec2f(0); } -// static ofVec2f max() { return ofVec2f(1); } -//}; +template <> +struct TypeInfo { + static ofVec2f min() { return ofVec2f(0); } + static ofVec2f max() { return ofVec2f(1); } +}; +#endif template <> struct TypeInfo { @@ -393,11 +399,13 @@ struct TypeInfo { static glm::vec2 max() { return glm::vec2(1); } }; -//template <> -//struct TypeInfo { -// static ofVec3f min() { return ofVec3f(0); } -// static ofVec3f max() { return ofVec3f(1); } -//}; +#ifdef OF_USE_LEGACY_MATH +template <> +struct TypeInfo { + static ofVec3f min() { return ofVec3f(0); } + static ofVec3f max() { return ofVec3f(1); } +}; +#endif template <> struct TypeInfo { diff --git a/libs/openFrameworks/types/ofParameterGroup.cpp b/libs/openFrameworks/types/ofParameterGroup.cpp index f17f1e39a47..35a3372817d 100644 --- a/libs/openFrameworks/types/ofParameterGroup.cpp +++ b/libs/openFrameworks/types/ofParameterGroup.cpp @@ -80,9 +80,11 @@ const ofParameter & ofParameterGroup::getString(const std::string & return get(name); } -//const ofParameter & ofParameterGroup::getPoint(const std::string & name) const { -// return get(name); -//} +#ifdef OF_USE_LEGACY_MATH +const ofParameter & ofParameterGroup::getPoint(const std::string & name) const { + return get(name); +} +#endif const ofParameter & ofParameterGroup::getVec2f(const std::string & name) const { return get(name); diff --git a/tests/math/ofNodeRegressionTests/src/main.cpp b/tests/math/ofNodeRegressionTests/src/main.cpp index b7f1f1000a1..23733194950 100644 --- a/tests/math/ofNodeRegressionTests/src/main.cpp +++ b/tests/math/ofNodeRegressionTests/src/main.cpp @@ -1,7 +1,6 @@ #include "ofMain.h" #include "ofxUnitTests.h" #include "ofAppNoWindow.h" -#include "ofQuaternion.h" bool aprox_eq(const glm::vec3 & v1, const glm::vec3 & v2){ @@ -109,7 +108,6 @@ class ofApp: public ofxUnitTestsApp{ n1.setGlobalPosition({ 100.f,0.f,0.f }); glm::quat rot = glm::angleAxis(glm::radians(-90.0f), glm::normalize(glm::vec3(0.f, -1.f, 1.f))); - // n1.setGlobalOrientation(ofQuaternion(-90, { 0.f,-1.f,1.f })); n1.setGlobalOrientation(rot); n2.setParent(n1); n2.truck(50.f); From 2d937505d951c19869dd74fa988b1bbdd20a9187 Mon Sep 17 00:00:00 2001 From: Dimitre Date: Sun, 3 Nov 2024 10:56:46 -0300 Subject: [PATCH 20/22] tidy up --- libs/openFrameworks/types/ofParameter.h | 12 ++++++---- .../openFrameworks/types/ofParameterGroup.cpp | 24 ++++++++++++------- 2 files changed, 22 insertions(+), 14 deletions(-) diff --git a/libs/openFrameworks/types/ofParameter.h b/libs/openFrameworks/types/ofParameter.h index 3fcfae34b0e..29de5a1f709 100644 --- a/libs/openFrameworks/types/ofParameter.h +++ b/libs/openFrameworks/types/ofParameter.h @@ -413,11 +413,13 @@ struct TypeInfo { static glm::vec3 max() { return glm::vec3(1); } }; -//template <> -//struct TypeInfo { -// static ofVec4f min() { return ofVec4f(0); } -// static ofVec4f max() { return ofVec4f(1); } -//}; +#ifdef OF_USE_LEGACY_MATH +template <> +struct TypeInfo { + static ofVec4f min() { return ofVec4f(0); } + static ofVec4f max() { return ofVec4f(1); } +}; +#endif template <> struct TypeInfo { diff --git a/libs/openFrameworks/types/ofParameterGroup.cpp b/libs/openFrameworks/types/ofParameterGroup.cpp index 35a3372817d..c542f0fbfe3 100644 --- a/libs/openFrameworks/types/ofParameterGroup.cpp +++ b/libs/openFrameworks/types/ofParameterGroup.cpp @@ -142,9 +142,11 @@ const ofParameter & ofParameterGroup::getString(std::size_t pos) co return get(pos); } -//const ofParameter & ofParameterGroup::getPoint(std::size_t pos) const { -// return get(pos); -//} +#ifdef OF_USE_LEGACY_MATH +const ofParameter & ofParameterGroup::getPoint(std::size_t pos) const { + return get(pos); +} +#endif const ofParameter & ofParameterGroup::getVec2f(std::size_t pos) const { return get(pos); @@ -210,9 +212,11 @@ ofParameter & ofParameterGroup::getString(const std::string & name) return get(name); } -//ofParameter & ofParameterGroup::getPoint(const std::string & name) { -// return get(name); -//} +#ifdef OF_USE_LEGACY_MATH +ofParameter & ofParameterGroup::getPoint(const std::string & name) { + return get(name); +} +#endif ofParameter & ofParameterGroup::getVec2f(const std::string & name) { return get(name); @@ -269,9 +273,11 @@ ofParameter & ofParameterGroup::getString(std::size_t pos) { return get(pos); } -//ofParameter & ofParameterGroup::getPoint(std::size_t pos) { -// return get(pos); -//} +#ifdef OF_USE_LEGACY_MATH +ofParameter & ofParameterGroup::getPoint(std::size_t pos) { + return get(pos); +} +#endif ofParameter & ofParameterGroup::getVec2f(std::size_t pos) { return get(pos); From 28c4d205565a1cfee248a41826e727cd23bd4525 Mon Sep 17 00:00:00 2001 From: Dimitre Date: Sun, 3 Nov 2024 10:57:44 -0300 Subject: [PATCH 21/22] tidy up --- addons/ofxOpenCv/src/ofxCvBlob.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/addons/ofxOpenCv/src/ofxCvBlob.h b/addons/ofxOpenCv/src/ofxCvBlob.h index 70d7835952d..d34a90d064f 100644 --- a/addons/ofxOpenCv/src/ofxCvBlob.h +++ b/addons/ofxOpenCv/src/ofxCvBlob.h @@ -45,9 +45,6 @@ class ofxCvBlob { for (const auto & p : pts) { ofVertex(p); } - // for (int i = 0; i < nPts; i++){ - // ofVertex(pts[i].x, y pts[i].y); - // } ofEndShape(true); ofSetHexColor(0xff0099); ofDrawRectangle(boundingRect); From d05f4f2efefe7a03f8ac5743825cb7f6387f7408 Mon Sep 17 00:00:00 2001 From: Dimitre Date: Sun, 10 Nov 2024 21:41:10 -0300 Subject: [PATCH 22/22] revert xcode newer project to master --- .../project.pbxproj | 886 ++++++++++++++++-- 1 file changed, 787 insertions(+), 99 deletions(-) diff --git a/libs/openFrameworksCompiled/project/osx/openFrameworksLib.xcodeproj/project.pbxproj b/libs/openFrameworksCompiled/project/osx/openFrameworksLib.xcodeproj/project.pbxproj index d0bbdb66ddf..160499121cb 100644 --- a/libs/openFrameworksCompiled/project/osx/openFrameworksLib.xcodeproj/project.pbxproj +++ b/libs/openFrameworksCompiled/project/osx/openFrameworksLib.xcodeproj/project.pbxproj @@ -3,28 +3,238 @@ archiveVersion = 1; classes = { }; - objectVersion = 70; + objectVersion = 54; objects = { /* Begin PBXBuildFile section */ - 031A7A542CD5F33300797180 /* cairo.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF5BF8492B737E260049DEF6 /* cairo.xcframework */; }; - 031A7A562CD5F33400797180 /* curl.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF6276A32BAD6639008864C1 /* curl.xcframework */; }; - 031A7A582CD5F33600797180 /* FreeImage.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF5BF84B2B737E320049DEF6 /* FreeImage.xcframework */; }; - 031A7A5A2CD5F33700797180 /* freetype.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF5BF84D2B737E3B0049DEF6 /* freetype.xcframework */; }; - 031A7A5C2CD5F33B00797180 /* glew.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF5BF84F2B737E440049DEF6 /* glew.xcframework */; }; - 031A7A5E2CD5F33C00797180 /* glfw.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF5BF8512B737E4E0049DEF6 /* glfw.xcframework */; }; - 031A7A602CD5F33E00797180 /* libpng.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF5BF8532B737E880049DEF6 /* libpng.xcframework */; }; - 031A7A622CD5F33F00797180 /* openssl.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF6276A12BAD6619008864C1 /* openssl.xcframework */; }; - 031A7A642CD5F34100797180 /* pixman.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF5BF8552B737E930049DEF6 /* pixman.xcframework */; }; - 031A7A662CD5F34200797180 /* pugixml.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF5BF8472B737D280049DEF6 /* pugixml.xcframework */; }; - 031A7A682CD5F34500797180 /* rtAudio.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF5BF8452B737C870049DEF6 /* rtAudio.xcframework */; }; - 031A7A6A2CD5F34500797180 /* tess2.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF5BF8432B737C7C0049DEF6 /* tess2.xcframework */; }; - 031A7A6C2CD5F34A00797180 /* uriparser.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF5BF8412B737C700049DEF6 /* uriparser.xcframework */; }; - 031A7A6E2CD5F34A00797180 /* zlib.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF5BF83F2B737C0A0049DEF6 /* zlib.xcframework */; }; - 037A65F92CD72C1000CF8AC1 /* brotli.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF7C462D2C097CCE00461163 /* brotli.xcframework */; }; + 0353245D2BEFEC7B00B50A35 /* ofTimerFps.h in Headers */ = {isa = PBXBuildFile; fileRef = 0353245B2BEFEC7A00B50A35 /* ofTimerFps.h */; }; + 0353245E2BEFEC7B00B50A35 /* ofTimerFps.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0353245C2BEFEC7B00B50A35 /* ofTimerFps.cpp */; }; + 19662F2E2834A44400B622ED /* ofGraphicsCairo.h in Headers */ = {isa = PBXBuildFile; fileRef = 19662F2C2834A44400B622ED /* ofGraphicsCairo.h */; }; + 19662F2F2834A44400B622ED /* ofGraphicsCairo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 19662F2D2834A44400B622ED /* ofGraphicsCairo.cpp */; }; + 22246D93176C9987008A8AF4 /* ofGLProgrammableRenderer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 22246D91176C9987008A8AF4 /* ofGLProgrammableRenderer.cpp */; }; + 22246D94176C9987008A8AF4 /* ofGLProgrammableRenderer.h in Headers */ = {isa = PBXBuildFile; fileRef = 22246D92176C9987008A8AF4 /* ofGLProgrammableRenderer.h */; }; + 22769591170D9DD200604FC3 /* ofMatrixStack.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2276958F170D9DD200604FC3 /* ofMatrixStack.cpp */; }; + 22769592170D9DD200604FC3 /* ofMatrixStack.h in Headers */ = {isa = PBXBuildFile; fileRef = 22769590170D9DD200604FC3 /* ofMatrixStack.h */; }; + 2292E73E19E3049700DE9411 /* ofBufferObject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2292E73C19E3049700DE9411 /* ofBufferObject.cpp */; }; + 2292E73F19E3049700DE9411 /* ofBufferObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 2292E73D19E3049700DE9411 /* ofBufferObject.h */; }; + 229EB9A61B3181C800FF7B5F /* ofEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 229EB9A51B3181C800FF7B5F /* ofEvent.h */; }; + 22A1C453170AFCB60079E473 /* ofRendererCollection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 22A1C452170AFCB60079E473 /* ofRendererCollection.cpp */; }; + 22FAD01E17049373002A7EB3 /* ofAppGLFWWindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 22FAD01C17049373002A7EB3 /* ofAppGLFWWindow.cpp */; }; + 22FAD01F17049373002A7EB3 /* ofAppGLFWWindow.h in Headers */ = {isa = PBXBuildFile; fileRef = 22FAD01D17049373002A7EB3 /* ofAppGLFWWindow.h */; }; + 27DEA3111796F578000A9E90 /* ofXml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 27DEA30F1796F578000A9E90 /* ofXml.cpp */; }; + 27DEA3121796F578000A9E90 /* ofXml.h in Headers */ = {isa = PBXBuildFile; fileRef = 27DEA3101796F578000A9E90 /* ofXml.h */; }; + 2E498914292C96340096EC56 /* ofCubeMap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E498911292C96340096EC56 /* ofCubeMap.cpp */; }; + 2E498915292C96340096EC56 /* ofCubeMapShaders.h in Headers */ = {isa = PBXBuildFile; fileRef = 2E498912292C96340096EC56 /* ofCubeMapShaders.h */; }; + 2E498916292C96340096EC56 /* ofCubeMap.h in Headers */ = {isa = PBXBuildFile; fileRef = 2E498913292C96340096EC56 /* ofCubeMap.h */; }; + 2E4D30C128F5BA9C0074D450 /* ofShadow.h in Headers */ = {isa = PBXBuildFile; fileRef = 2E4D30BF28F5BA9C0074D450 /* ofShadow.h */; }; + 2E4D30C228F5BA9C0074D450 /* ofShadow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E4D30C028F5BA9C0074D450 /* ofShadow.cpp */; }; + 2E6EA7011603A9E400B7ADF3 /* of3dGraphics.h in Headers */ = {isa = PBXBuildFile; fileRef = 2E6EA7001603A9E400B7ADF3 /* of3dGraphics.h */; }; + 2E6EA7041603AA7A00B7ADF3 /* of3dGraphics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E6EA7031603AA7A00B7ADF3 /* of3dGraphics.cpp */; }; + 2E6EA7061603AABD00B7ADF3 /* of3dPrimitives.h in Headers */ = {isa = PBXBuildFile; fileRef = 2E6EA7051603AABD00B7ADF3 /* of3dPrimitives.h */; }; + 2E6EA7081603AAD600B7ADF3 /* of3dPrimitives.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E6EA7071603AAD600B7ADF3 /* of3dPrimitives.cpp */; }; + 30CC5385207A36FD008234AF /* ofMathConstants.h in Headers */ = {isa = PBXBuildFile; fileRef = 30CC5384207A36FD008234AF /* ofMathConstants.h */; }; + 53EEEF4B130766EF0027C199 /* ofMesh.h in Headers */ = {isa = PBXBuildFile; fileRef = 53EEEF49130766EF0027C199 /* ofMesh.h */; }; + 6678E96F19FEAFA900C00581 /* ofSoundBuffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6678E96D19FEAFA900C00581 /* ofSoundBuffer.cpp */; }; + 6678E97019FEAFA900C00581 /* ofSoundBuffer.h in Headers */ = {isa = PBXBuildFile; fileRef = 6678E96E19FEAFA900C00581 /* ofSoundBuffer.h */; }; + 6678E97F19FEB5A600C00581 /* ofSoundUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 6678E97C19FEB5A600C00581 /* ofSoundUtils.h */; }; + 676672A31A749D1900400051 /* ofAVFoundationVideoPlayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 6766729D1A749D1900400051 /* ofAVFoundationVideoPlayer.m */; }; + 676672A41A749D1900400051 /* ofAVFoundationPlayer.h in Headers */ = {isa = PBXBuildFile; fileRef = 6766729E1A749D1900400051 /* ofAVFoundationPlayer.h */; }; + 676672A51A749D1900400051 /* ofAVFoundationVideoPlayer.h in Headers */ = {isa = PBXBuildFile; fileRef = 6766729F1A749D1900400051 /* ofAVFoundationVideoPlayer.h */; }; + 676672A81A749D1900400051 /* ofAVFoundationPlayer.mm in Sources */ = {isa = PBXBuildFile; fileRef = 676672A21A749D1900400051 /* ofAVFoundationPlayer.mm */; }; + 67D96B971651AF6D00D5242D /* ofGLUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 67D96B941651AF6D00D5242D /* ofGLUtils.cpp */; }; + 692C298B19DC5C5500C27C5D /* ofFpsCounter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 692C298719DC5C5500C27C5D /* ofFpsCounter.cpp */; }; + 692C298C19DC5C5500C27C5D /* ofFpsCounter.h in Headers */ = {isa = PBXBuildFile; fileRef = 692C298819DC5C5500C27C5D /* ofFpsCounter.h */; }; + 692C298D19DC5C5500C27C5D /* ofTimer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 692C298919DC5C5500C27C5D /* ofTimer.cpp */; }; + 692C298E19DC5C5500C27C5D /* ofTimer.h in Headers */ = {isa = PBXBuildFile; fileRef = 692C298A19DC5C5500C27C5D /* ofTimer.h */; }; + 694425161FE4544C00770088 /* ofGLBaseTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = 694425151FE4544C00770088 /* ofGLBaseTypes.h */; }; + 6944251A1FE4547400770088 /* ofGraphicsBaseTypes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 694425171FE4547400770088 /* ofGraphicsBaseTypes.cpp */; }; + 6944251B1FE4547400770088 /* ofGraphicsBaseTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = 694425181FE4547400770088 /* ofGraphicsBaseTypes.h */; }; + 6944251C1FE4547400770088 /* ofGraphicsConstants.h in Headers */ = {isa = PBXBuildFile; fileRef = 694425191FE4547400770088 /* ofGraphicsConstants.h */; }; + 6944251F1FE4548B00770088 /* ofSoundBaseTypes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6944251D1FE4548B00770088 /* ofSoundBaseTypes.cpp */; }; + 694425201FE4548B00770088 /* ofSoundBaseTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = 6944251E1FE4548B00770088 /* ofSoundBaseTypes.h */; }; + 694425221FE456AF00770088 /* ofVideoBaseTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = 694425211FE456AF00770088 /* ofVideoBaseTypes.h */; }; + 772BDF73146928600030F0EE /* ofOpenALSoundPlayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 772BDF71146928600030F0EE /* ofOpenALSoundPlayer.cpp */; }; + 772BDF74146928600030F0EE /* ofOpenALSoundPlayer.h in Headers */ = {isa = PBXBuildFile; fileRef = 772BDF72146928600030F0EE /* ofOpenALSoundPlayer.h */; }; + 92C55F88132DA7DD00EC2631 /* ofPath.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 92C55F86132DA7DD00EC2631 /* ofPath.cpp */; }; + 92C55F89132DA7DD00EC2631 /* ofPath.h in Headers */ = {isa = PBXBuildFile; fileRef = 92C55F87132DA7DD00EC2631 /* ofPath.h */; }; + 9979E8221A1CCC44007E55D1 /* ofWindowSettings.h in Headers */ = {isa = PBXBuildFile; fileRef = 9979E81F1A1CCC44007E55D1 /* ofWindowSettings.h */; }; + 9979E8231A1CCC44007E55D1 /* ofMainLoop.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9979E8201A1CCC44007E55D1 /* ofMainLoop.cpp */; }; + 9979E8241A1CCC44007E55D1 /* ofMainLoop.h in Headers */ = {isa = PBXBuildFile; fileRef = 9979E8211A1CCC44007E55D1 /* ofMainLoop.h */; }; + BBA81C431FFBE4DB0064EA94 /* ofBaseApp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BBA81C421FFBE4DB0064EA94 /* ofBaseApp.cpp */; }; + BF6276A62BAD9900008864C1 /* ofBaseTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = BF6276A52BAD9900008864C1 /* ofBaseTypes.h */; }; + BFB0B3F52C50DFE8008FB5A3 /* brotli.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF7C462D2C097CCE00461163 /* brotli.xcframework */; }; + BFB0B3F62C50DFE8008FB5A3 /* curl.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF6276A32BAD6639008864C1 /* curl.xcframework */; }; + BFB0B3F72C50DFE8008FB5A3 /* openssl.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF6276A12BAD6619008864C1 /* openssl.xcframework */; }; + BFB0B3F82C50DFE8008FB5A3 /* pixman.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF5BF8552B737E930049DEF6 /* pixman.xcframework */; }; + BFB0B3F92C50DFE8008FB5A3 /* libpng.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF5BF8532B737E880049DEF6 /* libpng.xcframework */; }; + BFB0B3FA2C50DFE8008FB5A3 /* glfw.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF5BF8512B737E4E0049DEF6 /* glfw.xcframework */; }; + BFB0B3FB2C50DFE8008FB5A3 /* glew.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF5BF84F2B737E440049DEF6 /* glew.xcframework */; }; + BFB0B3FC2C50DFE8008FB5A3 /* freetype.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF5BF84D2B737E3B0049DEF6 /* freetype.xcframework */; }; + BFB0B3FD2C50DFE8008FB5A3 /* FreeImage.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF5BF84B2B737E320049DEF6 /* FreeImage.xcframework */; }; + BFB0B3FE2C50DFE8008FB5A3 /* cairo.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF5BF8492B737E260049DEF6 /* cairo.xcframework */; }; + BFB0B3FF2C50DFE8008FB5A3 /* pugixml.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF5BF8472B737D280049DEF6 /* pugixml.xcframework */; }; + BFB0B4002C50DFE8008FB5A3 /* rtAudio.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF5BF8452B737C870049DEF6 /* rtAudio.xcframework */; }; + BFB0B4012C50DFE8008FB5A3 /* tess2.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF5BF8432B737C7C0049DEF6 /* tess2.xcframework */; }; + BFB0B4022C50DFE8008FB5A3 /* uriparser.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF5BF8412B737C700049DEF6 /* uriparser.xcframework */; }; + BFB0B4032C50DFE8008FB5A3 /* zlib.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF5BF83F2B737C0A0049DEF6 /* zlib.xcframework */; }; + DA48FE78131D85A6000062BC /* ofPolyline.h in Headers */ = {isa = PBXBuildFile; fileRef = DA48FE74131D85A6000062BC /* ofPolyline.h */; }; + DA94C2F01301D32200CCC773 /* ofRendererCollection.h in Headers */ = {isa = PBXBuildFile; fileRef = DA94C2ED1301D32200CCC773 /* ofRendererCollection.h */; }; + DA97FD3C12F5A61A005C9991 /* ofCairoRenderer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DA97FD3612F5A61A005C9991 /* ofCairoRenderer.cpp */; }; + DA97FD3D12F5A61A005C9991 /* ofCairoRenderer.h in Headers */ = {isa = PBXBuildFile; fileRef = DA97FD3712F5A61A005C9991 /* ofCairoRenderer.h */; }; + DAC22D3F16E7A4AF0020226D /* ofParameter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DAC22D3B16E7A4AF0020226D /* ofParameter.cpp */; }; + DAC22D4016E7A4AF0020226D /* ofParameter.h in Headers */ = {isa = PBXBuildFile; fileRef = DAC22D3C16E7A4AF0020226D /* ofParameter.h */; }; + DAC22D4116E7A4AF0020226D /* ofParameterGroup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DAC22D3D16E7A4AF0020226D /* ofParameterGroup.cpp */; }; + DACFA8DA132D09E8008D4B7A /* ofFbo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DACFA8C9132D09E8008D4B7A /* ofFbo.cpp */; }; + DACFA8DB132D09E8008D4B7A /* ofFbo.h in Headers */ = {isa = PBXBuildFile; fileRef = DACFA8CA132D09E8008D4B7A /* ofFbo.h */; }; + DACFA8DC132D09E8008D4B7A /* ofGLRenderer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DACFA8CB132D09E8008D4B7A /* ofGLRenderer.cpp */; }; + DACFA8DD132D09E8008D4B7A /* ofGLRenderer.h in Headers */ = {isa = PBXBuildFile; fileRef = DACFA8CC132D09E8008D4B7A /* ofGLRenderer.h */; }; + DACFA8DE132D09E8008D4B7A /* ofGLUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = DACFA8CD132D09E8008D4B7A /* ofGLUtils.h */; }; + DACFA8DF132D09E8008D4B7A /* ofLight.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DACFA8CE132D09E8008D4B7A /* ofLight.cpp */; }; + DACFA8E0132D09E8008D4B7A /* ofLight.h in Headers */ = {isa = PBXBuildFile; fileRef = DACFA8CF132D09E8008D4B7A /* ofLight.h */; }; + DACFA8E1132D09E8008D4B7A /* ofMaterial.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DACFA8D0132D09E8008D4B7A /* ofMaterial.cpp */; }; + DACFA8E2132D09E8008D4B7A /* ofMaterial.h in Headers */ = {isa = PBXBuildFile; fileRef = DACFA8D1132D09E8008D4B7A /* ofMaterial.h */; }; + DACFA8E3132D09E8008D4B7A /* ofShader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DACFA8D2132D09E8008D4B7A /* ofShader.cpp */; }; + DACFA8E4132D09E8008D4B7A /* ofShader.h in Headers */ = {isa = PBXBuildFile; fileRef = DACFA8D3132D09E8008D4B7A /* ofShader.h */; }; + DACFA8E5132D09E8008D4B7A /* ofTexture.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DACFA8D4132D09E8008D4B7A /* ofTexture.cpp */; }; + DACFA8E6132D09E8008D4B7A /* ofTexture.h in Headers */ = {isa = PBXBuildFile; fileRef = DACFA8D5132D09E8008D4B7A /* ofTexture.h */; }; + DACFA8E7132D09E8008D4B7A /* ofVbo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DACFA8D6132D09E8008D4B7A /* ofVbo.cpp */; }; + DACFA8E8132D09E8008D4B7A /* ofVbo.h in Headers */ = {isa = PBXBuildFile; fileRef = DACFA8D7132D09E8008D4B7A /* ofVbo.h */; }; + DACFA8E9132D09E8008D4B7A /* ofVboMesh.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DACFA8D8132D09E8008D4B7A /* ofVboMesh.cpp */; }; + DACFA8EA132D09E8008D4B7A /* ofVboMesh.h in Headers */ = {isa = PBXBuildFile; fileRef = DACFA8D9132D09E8008D4B7A /* ofVboMesh.h */; }; + E43EEAC329E66B78001C7596 /* ofAVEngineSoundPlayer.mm in Sources */ = {isa = PBXBuildFile; fileRef = E43EEAC129E66B78001C7596 /* ofAVEngineSoundPlayer.mm */; }; + E43EEAC429E66B78001C7596 /* ofAVEngineSoundPlayer.h in Headers */ = {isa = PBXBuildFile; fileRef = E43EEAC229E66B78001C7596 /* ofAVEngineSoundPlayer.h */; }; + E486629A1D8C61B000D1735C /* ofAVFoundationGrabber.h in Headers */ = {isa = PBXBuildFile; fileRef = E48662981D8C61B000D1735C /* ofAVFoundationGrabber.h */; }; + E486629B1D8C61B000D1735C /* ofAVFoundationGrabber.mm in Sources */ = {isa = PBXBuildFile; fileRef = E48662991D8C61B000D1735C /* ofAVFoundationGrabber.mm */; }; + E495DF7D178896A900994238 /* ofAppNoWindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E495DF7B178896A900994238 /* ofAppNoWindow.cpp */; }; + E495DF7E178896A900994238 /* ofAppNoWindow.h in Headers */ = {isa = PBXBuildFile; fileRef = E495DF7C178896A900994238 /* ofAppNoWindow.h */; }; + E4998A26128A39480094AC3F /* ofEvents.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4998A25128A39480094AC3F /* ofEvents.cpp */; }; + E4B27C1910CBEB9D00536013 /* ofAppRunner.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4B27AAF10CBE92A00536013 /* ofAppRunner.cpp */; }; + E4B27C1A10CBEB9D00536013 /* ofArduino.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4B27AB310CBE92A00536013 /* ofArduino.cpp */; }; + E4B27C1B10CBEB9D00536013 /* ofSerial.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4B27AB510CBE92A00536013 /* ofSerial.cpp */; }; + E4B27C2610CBEB9D00536013 /* ofVideoGrabber.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4B27ADB10CBE92A00536013 /* ofVideoGrabber.cpp */; }; + E4B27C2710CBEB9D00536013 /* ofVideoPlayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4B27ADD10CBE92A00536013 /* ofVideoPlayer.cpp */; }; + E4C5E387131AC1B10050F992 /* ofRtAudioSoundStream.h in Headers */ = {isa = PBXBuildFile; fileRef = E4C5E385131AC1B10050F992 /* ofRtAudioSoundStream.h */; }; + E4C5E388131AC1B10050F992 /* ofRtAudioSoundStream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4C5E386131AC1B10050F992 /* ofRtAudioSoundStream.cpp */; }; + E4F3BA6712F4C4BF002D19BB /* of3dUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4F3BA5312F4C4BF002D19BB /* of3dUtils.cpp */; }; + E4F3BA6812F4C4BF002D19BB /* of3dUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = E4F3BA5412F4C4BF002D19BB /* of3dUtils.h */; }; + E4F3BA6912F4C4BF002D19BB /* ofCamera.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4F3BA5512F4C4BF002D19BB /* ofCamera.cpp */; }; + E4F3BA6A12F4C4BF002D19BB /* ofCamera.h in Headers */ = {isa = PBXBuildFile; fileRef = E4F3BA5612F4C4BF002D19BB /* ofCamera.h */; }; + E4F3BA6B12F4C4BF002D19BB /* ofEasyCam.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4F3BA5712F4C4BF002D19BB /* ofEasyCam.cpp */; }; + E4F3BA6C12F4C4BF002D19BB /* ofEasyCam.h in Headers */ = {isa = PBXBuildFile; fileRef = E4F3BA5812F4C4BF002D19BB /* ofEasyCam.h */; }; + E4F3BA7312F4C4BF002D19BB /* ofNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4F3BA5F12F4C4BF002D19BB /* ofNode.cpp */; }; + E4F3BA7412F4C4BF002D19BB /* ofNode.h in Headers */ = {isa = PBXBuildFile; fileRef = E4F3BA6012F4C4BF002D19BB /* ofNode.h */; }; + E4F3BA8A12F4C4C9002D19BB /* ofFmodSoundPlayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4F3BA7E12F4C4C9002D19BB /* ofFmodSoundPlayer.cpp */; }; + E4F3BA8B12F4C4C9002D19BB /* ofFmodSoundPlayer.h in Headers */ = {isa = PBXBuildFile; fileRef = E4F3BA7F12F4C4C9002D19BB /* ofFmodSoundPlayer.h */; }; + E4F3BA8E12F4C4C9002D19BB /* ofSoundPlayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4F3BA8212F4C4C9002D19BB /* ofSoundPlayer.cpp */; }; + E4F3BA8F12F4C4C9002D19BB /* ofSoundPlayer.h in Headers */ = {isa = PBXBuildFile; fileRef = E4F3BA8312F4C4C9002D19BB /* ofSoundPlayer.h */; }; + E4F3BA9012F4C4C9002D19BB /* ofSoundStream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4F3BA8412F4C4C9002D19BB /* ofSoundStream.cpp */; }; + E4F3BA9112F4C4C9002D19BB /* ofSoundStream.h in Headers */ = {isa = PBXBuildFile; fileRef = E4F3BA8512F4C4C9002D19BB /* ofSoundStream.h */; }; + E4F3BAC112F4C72F002D19BB /* ofMath.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4F3BAB312F4C72E002D19BB /* ofMath.cpp */; }; + E4F3BAC212F4C72F002D19BB /* ofMath.h in Headers */ = {isa = PBXBuildFile; fileRef = E4F3BAB412F4C72E002D19BB /* ofMath.h */; }; + E4F3BAC312F4C72F002D19BB /* ofMatrix3x3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4F3BAB512F4C72E002D19BB /* ofMatrix3x3.cpp */; }; + E4F3BAC412F4C72F002D19BB /* ofMatrix3x3.h in Headers */ = {isa = PBXBuildFile; fileRef = E4F3BAB612F4C72E002D19BB /* ofMatrix3x3.h */; }; + E4F3BAC512F4C72F002D19BB /* ofMatrix4x4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4F3BAB712F4C72E002D19BB /* ofMatrix4x4.cpp */; }; + E4F3BAC612F4C72F002D19BB /* ofMatrix4x4.h in Headers */ = {isa = PBXBuildFile; fileRef = E4F3BAB812F4C72E002D19BB /* ofMatrix4x4.h */; }; + E4F3BAC712F4C72F002D19BB /* ofQuaternion.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4F3BAB912F4C72F002D19BB /* ofQuaternion.cpp */; }; + E4F3BAC812F4C72F002D19BB /* ofQuaternion.h in Headers */ = {isa = PBXBuildFile; fileRef = E4F3BABA12F4C72F002D19BB /* ofQuaternion.h */; }; + E4F3BAC912F4C72F002D19BB /* ofVec2f.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4F3BABB12F4C72F002D19BB /* ofVec2f.cpp */; }; + E4F3BACA12F4C72F002D19BB /* ofVec2f.h in Headers */ = {isa = PBXBuildFile; fileRef = E4F3BABC12F4C72F002D19BB /* ofVec2f.h */; }; + E4F3BACB12F4C72F002D19BB /* ofVec3f.h in Headers */ = {isa = PBXBuildFile; fileRef = E4F3BABD12F4C72F002D19BB /* ofVec3f.h */; }; + E4F3BACC12F4C72F002D19BB /* ofVec4f.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4F3BABE12F4C72F002D19BB /* ofVec4f.cpp */; }; + E4F3BACD12F4C72F002D19BB /* ofVec4f.h in Headers */ = {isa = PBXBuildFile; fileRef = E4F3BABF12F4C72F002D19BB /* ofVec4f.h */; }; + E4F3BACE12F4C72F002D19BB /* ofVectorMath.h in Headers */ = {isa = PBXBuildFile; fileRef = E4F3BAC012F4C72F002D19BB /* ofVectorMath.h */; }; + E4F3BAD912F4C73C002D19BB /* ofBaseTypes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4F3BAD012F4C73C002D19BB /* ofBaseTypes.cpp */; }; + E4F3BADB12F4C73C002D19BB /* ofColor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4F3BAD212F4C73C002D19BB /* ofColor.cpp */; }; + E4F3BADC12F4C73C002D19BB /* ofColor.h in Headers */ = {isa = PBXBuildFile; fileRef = E4F3BAD312F4C73C002D19BB /* ofColor.h */; }; + E4F3BADE12F4C73C002D19BB /* ofPoint.h in Headers */ = {isa = PBXBuildFile; fileRef = E4F3BAD512F4C73C002D19BB /* ofPoint.h */; }; + E4F3BADF12F4C73C002D19BB /* ofRectangle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4F3BAD612F4C73C002D19BB /* ofRectangle.cpp */; }; + E4F3BAE012F4C73C002D19BB /* ofRectangle.h in Headers */ = {isa = PBXBuildFile; fileRef = E4F3BAD712F4C73C002D19BB /* ofRectangle.h */; }; + E4F3BAE112F4C73C002D19BB /* ofTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = E4F3BAD812F4C73C002D19BB /* ofTypes.h */; }; + E4F3BAF112F4C745002D19BB /* ofConstants.h in Headers */ = {isa = PBXBuildFile; fileRef = E4F3BAE312F4C745002D19BB /* ofConstants.h */; }; + E4F3BAF212F4C745002D19BB /* ofFileUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4F3BAE412F4C745002D19BB /* ofFileUtils.cpp */; }; + E4F3BAF312F4C745002D19BB /* ofFileUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = E4F3BAE512F4C745002D19BB /* ofFileUtils.h */; }; + E4F3BAF412F4C745002D19BB /* ofLog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4F3BAE612F4C745002D19BB /* ofLog.cpp */; }; + E4F3BAF512F4C745002D19BB /* ofLog.h in Headers */ = {isa = PBXBuildFile; fileRef = E4F3BAE712F4C745002D19BB /* ofLog.h */; }; + E4F3BAF612F4C745002D19BB /* ofNoise.h in Headers */ = {isa = PBXBuildFile; fileRef = E4F3BAE812F4C745002D19BB /* ofNoise.h */; }; + E4F3BAF712F4C745002D19BB /* ofSystemUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4F3BAE912F4C745002D19BB /* ofSystemUtils.cpp */; settings = {COMPILER_FLAGS = "-x objective-c++"; }; }; + E4F3BAF812F4C745002D19BB /* ofSystemUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = E4F3BAEA12F4C745002D19BB /* ofSystemUtils.h */; }; + E4F3BAF912F4C745002D19BB /* ofThread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4F3BAEB12F4C745002D19BB /* ofThread.cpp */; }; + E4F3BAFA12F4C745002D19BB /* ofThread.h in Headers */ = {isa = PBXBuildFile; fileRef = E4F3BAEC12F4C745002D19BB /* ofThread.h */; }; + E4F3BAFB12F4C745002D19BB /* ofURLFileLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4F3BAED12F4C745002D19BB /* ofURLFileLoader.cpp */; }; + E4F3BAFC12F4C745002D19BB /* ofURLFileLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = E4F3BAEE12F4C745002D19BB /* ofURLFileLoader.h */; }; + E4F3BAFD12F4C745002D19BB /* ofUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4F3BAEF12F4C745002D19BB /* ofUtils.cpp */; }; + E4F3BAFE12F4C745002D19BB /* ofUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = E4F3BAF012F4C745002D19BB /* ofUtils.h */; }; + E4F3BB1812F4C752002D19BB /* ofBitmapFont.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4F3BB0012F4C751002D19BB /* ofBitmapFont.cpp */; }; + E4F3BB1912F4C752002D19BB /* ofBitmapFont.h in Headers */ = {isa = PBXBuildFile; fileRef = E4F3BB0112F4C751002D19BB /* ofBitmapFont.h */; }; + E4F3BB1C12F4C752002D19BB /* ofGraphics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4F3BB0412F4C752002D19BB /* ofGraphics.cpp */; }; + E4F3BB1D12F4C752002D19BB /* ofGraphics.h in Headers */ = {isa = PBXBuildFile; fileRef = E4F3BB0512F4C752002D19BB /* ofGraphics.h */; }; + E4F3BB1E12F4C752002D19BB /* ofImage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4F3BB0612F4C752002D19BB /* ofImage.cpp */; }; + E4F3BB1F12F4C752002D19BB /* ofImage.h in Headers */ = {isa = PBXBuildFile; fileRef = E4F3BB0712F4C752002D19BB /* ofImage.h */; }; + E4F3BB2012F4C752002D19BB /* ofPixels.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4F3BB0812F4C752002D19BB /* ofPixels.cpp */; }; + E4F3BB2112F4C752002D19BB /* ofPixels.h in Headers */ = {isa = PBXBuildFile; fileRef = E4F3BB0912F4C752002D19BB /* ofPixels.h */; }; + E4F3BB2A12F4C752002D19BB /* ofTessellator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4F3BB1212F4C752002D19BB /* ofTessellator.cpp */; }; + E4F3BB2B12F4C752002D19BB /* ofTessellator.h in Headers */ = {isa = PBXBuildFile; fileRef = E4F3BB1312F4C752002D19BB /* ofTessellator.h */; }; + E4F3BB2E12F4C752002D19BB /* ofTrueTypeFont.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4F3BB1612F4C752002D19BB /* ofTrueTypeFont.cpp */; }; + E4F3BB2F12F4C752002D19BB /* ofTrueTypeFont.h in Headers */ = {isa = PBXBuildFile; fileRef = E4F3BB1712F4C752002D19BB /* ofTrueTypeFont.h */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ + 0353245B2BEFEC7A00B50A35 /* ofTimerFps.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofTimerFps.h; sourceTree = ""; }; + 0353245C2BEFEC7B00B50A35 /* ofTimerFps.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ofTimerFps.cpp; sourceTree = ""; }; + 19662F2C2834A44400B622ED /* ofGraphicsCairo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofGraphicsCairo.h; sourceTree = ""; }; + 19662F2D2834A44400B622ED /* ofGraphicsCairo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ofGraphicsCairo.cpp; sourceTree = ""; }; + 22246D91176C9987008A8AF4 /* ofGLProgrammableRenderer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ofGLProgrammableRenderer.cpp; path = gl/ofGLProgrammableRenderer.cpp; sourceTree = ""; }; + 22246D92176C9987008A8AF4 /* ofGLProgrammableRenderer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofGLProgrammableRenderer.h; path = gl/ofGLProgrammableRenderer.h; sourceTree = ""; }; + 2276958F170D9DD200604FC3 /* ofMatrixStack.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ofMatrixStack.cpp; sourceTree = ""; }; + 22769590170D9DD200604FC3 /* ofMatrixStack.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofMatrixStack.h; sourceTree = ""; }; + 2292E73C19E3049700DE9411 /* ofBufferObject.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ofBufferObject.cpp; path = gl/ofBufferObject.cpp; sourceTree = ""; }; + 2292E73D19E3049700DE9411 /* ofBufferObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofBufferObject.h; path = gl/ofBufferObject.h; sourceTree = ""; }; + 229EB9A51B3181C800FF7B5F /* ofEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofEvent.h; sourceTree = ""; }; + 22A1C452170AFCB60079E473 /* ofRendererCollection.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ofRendererCollection.cpp; sourceTree = ""; }; + 22FAD01C17049373002A7EB3 /* ofAppGLFWWindow.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; path = ofAppGLFWWindow.cpp; sourceTree = ""; }; + 22FAD01D17049373002A7EB3 /* ofAppGLFWWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofAppGLFWWindow.h; sourceTree = ""; }; + 27DEA30F1796F578000A9E90 /* ofXml.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ofXml.cpp; sourceTree = ""; }; + 27DEA3101796F578000A9E90 /* ofXml.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofXml.h; sourceTree = ""; }; + 2E498911292C96340096EC56 /* ofCubeMap.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ofCubeMap.cpp; path = gl/ofCubeMap.cpp; sourceTree = ""; }; + 2E498912292C96340096EC56 /* ofCubeMapShaders.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofCubeMapShaders.h; path = gl/ofCubeMapShaders.h; sourceTree = ""; }; + 2E498913292C96340096EC56 /* ofCubeMap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofCubeMap.h; path = gl/ofCubeMap.h; sourceTree = ""; }; + 2E4D30BF28F5BA9C0074D450 /* ofShadow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofShadow.h; path = gl/ofShadow.h; sourceTree = ""; }; + 2E4D30C028F5BA9C0074D450 /* ofShadow.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ofShadow.cpp; path = gl/ofShadow.cpp; sourceTree = ""; }; + 2E6EA7001603A9E400B7ADF3 /* of3dGraphics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = of3dGraphics.h; sourceTree = ""; }; + 2E6EA7031603AA7A00B7ADF3 /* of3dGraphics.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = of3dGraphics.cpp; sourceTree = ""; }; + 2E6EA7051603AABD00B7ADF3 /* of3dPrimitives.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = of3dPrimitives.h; sourceTree = ""; }; + 2E6EA7071603AAD600B7ADF3 /* of3dPrimitives.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = of3dPrimitives.cpp; sourceTree = ""; }; + 30CC5384207A36FD008234AF /* ofMathConstants.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofMathConstants.h; sourceTree = ""; }; + 53EEEF49130766EF0027C199 /* ofMesh.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofMesh.h; sourceTree = ""; }; + 6448E6FB1CAD7679000877BC /* ofMesh.inl */ = {isa = PBXFileReference; lastKnownFileType = text; path = ofMesh.inl; sourceTree = ""; }; + 6448E6FC1CAD771D000877BC /* ofPolyline.inl */ = {isa = PBXFileReference; lastKnownFileType = text; path = ofPolyline.inl; sourceTree = ""; }; + 6678E96D19FEAFA900C00581 /* ofSoundBuffer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ofSoundBuffer.cpp; sourceTree = ""; }; + 6678E96E19FEAFA900C00581 /* ofSoundBuffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofSoundBuffer.h; sourceTree = ""; }; + 6678E97C19FEB5A600C00581 /* ofSoundUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofSoundUtils.h; sourceTree = ""; }; + 6766729D1A749D1900400051 /* ofAVFoundationVideoPlayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ofAVFoundationVideoPlayer.m; sourceTree = ""; }; + 6766729E1A749D1900400051 /* ofAVFoundationPlayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofAVFoundationPlayer.h; sourceTree = ""; }; + 6766729F1A749D1900400051 /* ofAVFoundationVideoPlayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofAVFoundationVideoPlayer.h; sourceTree = ""; }; + 676672A21A749D1900400051 /* ofAVFoundationPlayer.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ofAVFoundationPlayer.mm; sourceTree = ""; }; + 67D96B941651AF6D00D5242D /* ofGLUtils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ofGLUtils.cpp; path = gl/ofGLUtils.cpp; sourceTree = ""; }; + 692C298719DC5C5500C27C5D /* ofFpsCounter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ofFpsCounter.cpp; sourceTree = ""; }; + 692C298819DC5C5500C27C5D /* ofFpsCounter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofFpsCounter.h; sourceTree = ""; }; + 692C298919DC5C5500C27C5D /* ofTimer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ofTimer.cpp; sourceTree = ""; }; + 692C298A19DC5C5500C27C5D /* ofTimer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofTimer.h; sourceTree = ""; }; + 694425151FE4544C00770088 /* ofGLBaseTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofGLBaseTypes.h; path = gl/ofGLBaseTypes.h; sourceTree = ""; }; + 694425171FE4547400770088 /* ofGraphicsBaseTypes.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ofGraphicsBaseTypes.cpp; sourceTree = ""; }; + 694425181FE4547400770088 /* ofGraphicsBaseTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofGraphicsBaseTypes.h; sourceTree = ""; }; + 694425191FE4547400770088 /* ofGraphicsConstants.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofGraphicsConstants.h; sourceTree = ""; }; + 6944251D1FE4548B00770088 /* ofSoundBaseTypes.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ofSoundBaseTypes.cpp; sourceTree = ""; }; + 6944251E1FE4548B00770088 /* ofSoundBaseTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofSoundBaseTypes.h; sourceTree = ""; }; + 694425211FE456AF00770088 /* ofVideoBaseTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofVideoBaseTypes.h; sourceTree = ""; }; + 772BDF71146928600030F0EE /* ofOpenALSoundPlayer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ofOpenALSoundPlayer.cpp; sourceTree = ""; }; + 772BDF72146928600030F0EE /* ofOpenALSoundPlayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofOpenALSoundPlayer.h; sourceTree = ""; }; + 92C55F86132DA7DD00EC2631 /* ofPath.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ofPath.cpp; sourceTree = ""; }; + 92C55F87132DA7DD00EC2631 /* ofPath.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofPath.h; sourceTree = ""; }; + 9979E81F1A1CCC44007E55D1 /* ofWindowSettings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofWindowSettings.h; sourceTree = ""; }; + 9979E8201A1CCC44007E55D1 /* ofMainLoop.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ofMainLoop.cpp; sourceTree = ""; }; + 9979E8211A1CCC44007E55D1 /* ofMainLoop.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofMainLoop.h; sourceTree = ""; }; + BBA81C421FFBE4DB0064EA94 /* ofBaseApp.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ofBaseApp.cpp; sourceTree = ""; }; BF5BF83F2B737C0A0049DEF6 /* zlib.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = zlib.xcframework; path = ../../../zlib/lib/macos/zlib.xcframework; sourceTree = ""; }; BF5BF8412B737C700049DEF6 /* uriparser.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = uriparser.xcframework; path = ../../../uriparser/lib/macos/uriparser.xcframework; sourceTree = ""; }; BF5BF8432B737C7C0049DEF6 /* tess2.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = tess2.xcframework; path = ../../../tess2/lib/macos/tess2.xcframework; sourceTree = ""; }; @@ -39,85 +249,144 @@ BF5BF8552B737E930049DEF6 /* pixman.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = pixman.xcframework; path = ../../../pixman/lib/macos/pixman.xcframework; sourceTree = ""; }; BF6276A12BAD6619008864C1 /* openssl.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = openssl.xcframework; path = ../../../openssl/lib/macos/openssl.xcframework; sourceTree = ""; }; BF6276A32BAD6639008864C1 /* curl.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = curl.xcframework; path = ../../../curl/lib/macos/curl.xcframework; sourceTree = ""; }; + BF6276A52BAD9900008864C1 /* ofBaseTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofBaseTypes.h; sourceTree = ""; }; BF7C462D2C097CCE00461163 /* brotli.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = brotli.xcframework; path = ../../../brotli/lib/macos/brotli.xcframework; sourceTree = ""; }; + DA48FE74131D85A6000062BC /* ofPolyline.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofPolyline.h; sourceTree = ""; }; + DA94C2ED1301D32200CCC773 /* ofRendererCollection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofRendererCollection.h; sourceTree = ""; }; + DA97FD3612F5A61A005C9991 /* ofCairoRenderer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ofCairoRenderer.cpp; sourceTree = ""; }; + DA97FD3712F5A61A005C9991 /* ofCairoRenderer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofCairoRenderer.h; sourceTree = ""; }; + DAC22D3B16E7A4AF0020226D /* ofParameter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ofParameter.cpp; sourceTree = ""; }; + DAC22D3C16E7A4AF0020226D /* ofParameter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofParameter.h; sourceTree = ""; }; + DAC22D3D16E7A4AF0020226D /* ofParameterGroup.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ofParameterGroup.cpp; sourceTree = ""; }; + DACFA8C9132D09E8008D4B7A /* ofFbo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ofFbo.cpp; path = gl/ofFbo.cpp; sourceTree = ""; }; + DACFA8CA132D09E8008D4B7A /* ofFbo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofFbo.h; path = gl/ofFbo.h; sourceTree = ""; }; + DACFA8CB132D09E8008D4B7A /* ofGLRenderer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ofGLRenderer.cpp; path = gl/ofGLRenderer.cpp; sourceTree = ""; }; + DACFA8CC132D09E8008D4B7A /* ofGLRenderer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofGLRenderer.h; path = gl/ofGLRenderer.h; sourceTree = ""; }; + DACFA8CD132D09E8008D4B7A /* ofGLUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofGLUtils.h; path = gl/ofGLUtils.h; sourceTree = ""; }; + DACFA8CE132D09E8008D4B7A /* ofLight.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ofLight.cpp; path = gl/ofLight.cpp; sourceTree = ""; }; + DACFA8CF132D09E8008D4B7A /* ofLight.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofLight.h; path = gl/ofLight.h; sourceTree = ""; }; + DACFA8D0132D09E8008D4B7A /* ofMaterial.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ofMaterial.cpp; path = gl/ofMaterial.cpp; sourceTree = ""; }; + DACFA8D1132D09E8008D4B7A /* ofMaterial.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofMaterial.h; path = gl/ofMaterial.h; sourceTree = ""; }; + DACFA8D2132D09E8008D4B7A /* ofShader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ofShader.cpp; path = gl/ofShader.cpp; sourceTree = ""; }; + DACFA8D3132D09E8008D4B7A /* ofShader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofShader.h; path = gl/ofShader.h; sourceTree = ""; }; + DACFA8D4132D09E8008D4B7A /* ofTexture.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ofTexture.cpp; path = gl/ofTexture.cpp; sourceTree = ""; }; + DACFA8D5132D09E8008D4B7A /* ofTexture.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofTexture.h; path = gl/ofTexture.h; sourceTree = ""; }; + DACFA8D6132D09E8008D4B7A /* ofVbo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ofVbo.cpp; path = gl/ofVbo.cpp; sourceTree = ""; }; + DACFA8D7132D09E8008D4B7A /* ofVbo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofVbo.h; path = gl/ofVbo.h; sourceTree = ""; }; + DACFA8D8132D09E8008D4B7A /* ofVboMesh.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ofVboMesh.cpp; path = gl/ofVboMesh.cpp; sourceTree = ""; }; + DACFA8D9132D09E8008D4B7A /* ofVboMesh.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofVboMesh.h; path = gl/ofVboMesh.h; sourceTree = ""; }; E432815E138ABFDD0047C5CB /* Shared.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Shared.xcconfig; sourceTree = ""; }; E432815F138AC0470047C5CB /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = ""; }; E4328160138AC04A0047C5CB /* Release.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = ""; }; + E43EEAC129E66B78001C7596 /* ofAVEngineSoundPlayer.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ofAVEngineSoundPlayer.mm; sourceTree = ""; }; + E43EEAC229E66B78001C7596 /* ofAVEngineSoundPlayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofAVEngineSoundPlayer.h; sourceTree = ""; }; + E48662981D8C61B000D1735C /* ofAVFoundationGrabber.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.h; fileEncoding = 4; path = ofAVFoundationGrabber.h; sourceTree = ""; }; + E48662991D8C61B000D1735C /* ofAVFoundationGrabber.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ofAVFoundationGrabber.mm; sourceTree = ""; }; + E495DF7B178896A900994238 /* ofAppNoWindow.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ofAppNoWindow.cpp; sourceTree = ""; }; + E495DF7C178896A900994238 /* ofAppNoWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofAppNoWindow.h; sourceTree = ""; }; + E4998A25128A39480094AC3F /* ofEvents.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ofEvents.cpp; sourceTree = ""; }; + E4B27AAC10CBE92A00536013 /* ofAppBaseWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofAppBaseWindow.h; path = ../../../openFrameworks/app/ofAppBaseWindow.h; sourceTree = SOURCE_ROOT; }; + E4B27AAF10CBE92A00536013 /* ofAppRunner.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ofAppRunner.cpp; path = ../../../openFrameworks/app/ofAppRunner.cpp; sourceTree = SOURCE_ROOT; }; + E4B27AB010CBE92A00536013 /* ofAppRunner.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofAppRunner.h; path = ../../../openFrameworks/app/ofAppRunner.h; sourceTree = SOURCE_ROOT; }; + E4B27AB110CBE92A00536013 /* ofBaseApp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofBaseApp.h; path = ../../../openFrameworks/app/ofBaseApp.h; sourceTree = SOURCE_ROOT; }; + E4B27AB310CBE92A00536013 /* ofArduino.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ofArduino.cpp; path = ../../../openFrameworks/communication/ofArduino.cpp; sourceTree = SOURCE_ROOT; }; + E4B27AB410CBE92A00536013 /* ofArduino.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofArduino.h; path = ../../../openFrameworks/communication/ofArduino.h; sourceTree = SOURCE_ROOT; }; + E4B27AB510CBE92A00536013 /* ofSerial.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ofSerial.cpp; path = ../../../openFrameworks/communication/ofSerial.cpp; sourceTree = SOURCE_ROOT; }; + E4B27AB610CBE92A00536013 /* ofSerial.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofSerial.h; path = ../../../openFrameworks/communication/ofSerial.h; sourceTree = SOURCE_ROOT; }; + E4B27ABA10CBE92A00536013 /* ofEvents.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofEvents.h; path = ../../../openFrameworks/events/ofEvents.h; sourceTree = SOURCE_ROOT; }; + E4B27ABB10CBE92A00536013 /* ofEventUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofEventUtils.h; path = ../../../openFrameworks/events/ofEventUtils.h; sourceTree = SOURCE_ROOT; }; + E4B27AC710CBE92A00536013 /* ofMain.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofMain.h; path = ../../../openFrameworks/ofMain.h; sourceTree = SOURCE_ROOT; }; + E4B27ADB10CBE92A00536013 /* ofVideoGrabber.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ofVideoGrabber.cpp; path = ../../../openFrameworks/video/ofVideoGrabber.cpp; sourceTree = SOURCE_ROOT; }; + E4B27ADC10CBE92A00536013 /* ofVideoGrabber.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofVideoGrabber.h; path = ../../../openFrameworks/video/ofVideoGrabber.h; sourceTree = SOURCE_ROOT; }; + E4B27ADD10CBE92A00536013 /* ofVideoPlayer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ofVideoPlayer.cpp; path = ../../../openFrameworks/video/ofVideoPlayer.cpp; sourceTree = SOURCE_ROOT; }; + E4B27ADE10CBE92A00536013 /* ofVideoPlayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofVideoPlayer.h; path = ../../../openFrameworks/video/ofVideoPlayer.h; sourceTree = SOURCE_ROOT; }; E4B27C1510CBEB8E00536013 /* openFrameworksDebug.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = openFrameworksDebug.a; sourceTree = BUILT_PRODUCTS_DIR; }; + E4C5E385131AC1B10050F992 /* ofRtAudioSoundStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofRtAudioSoundStream.h; sourceTree = ""; }; + E4C5E386131AC1B10050F992 /* ofRtAudioSoundStream.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ofRtAudioSoundStream.cpp; sourceTree = ""; }; E4EB6916138AFC8500A09F29 /* CoreOF.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = CoreOF.xcconfig; sourceTree = ""; }; + E4F3BA5312F4C4BF002D19BB /* of3dUtils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = of3dUtils.cpp; path = ../../../openFrameworks/3d/of3dUtils.cpp; sourceTree = SOURCE_ROOT; }; + E4F3BA5412F4C4BF002D19BB /* of3dUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = of3dUtils.h; path = ../../../openFrameworks/3d/of3dUtils.h; sourceTree = SOURCE_ROOT; }; + E4F3BA5512F4C4BF002D19BB /* ofCamera.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ofCamera.cpp; path = ../../../openFrameworks/3d/ofCamera.cpp; sourceTree = SOURCE_ROOT; }; + E4F3BA5612F4C4BF002D19BB /* ofCamera.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofCamera.h; path = ../../../openFrameworks/3d/ofCamera.h; sourceTree = SOURCE_ROOT; }; + E4F3BA5712F4C4BF002D19BB /* ofEasyCam.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ofEasyCam.cpp; path = ../../../openFrameworks/3d/ofEasyCam.cpp; sourceTree = SOURCE_ROOT; }; + E4F3BA5812F4C4BF002D19BB /* ofEasyCam.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofEasyCam.h; path = ../../../openFrameworks/3d/ofEasyCam.h; sourceTree = SOURCE_ROOT; }; + E4F3BA5F12F4C4BF002D19BB /* ofNode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ofNode.cpp; path = ../../../openFrameworks/3d/ofNode.cpp; sourceTree = SOURCE_ROOT; }; + E4F3BA6012F4C4BF002D19BB /* ofNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofNode.h; path = ../../../openFrameworks/3d/ofNode.h; sourceTree = SOURCE_ROOT; }; + E4F3BA7E12F4C4C9002D19BB /* ofFmodSoundPlayer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ofFmodSoundPlayer.cpp; path = ../../../openFrameworks/sound/ofFmodSoundPlayer.cpp; sourceTree = SOURCE_ROOT; }; + E4F3BA7F12F4C4C9002D19BB /* ofFmodSoundPlayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofFmodSoundPlayer.h; path = ../../../openFrameworks/sound/ofFmodSoundPlayer.h; sourceTree = SOURCE_ROOT; }; + E4F3BA8212F4C4C9002D19BB /* ofSoundPlayer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ofSoundPlayer.cpp; path = ../../../openFrameworks/sound/ofSoundPlayer.cpp; sourceTree = SOURCE_ROOT; }; + E4F3BA8312F4C4C9002D19BB /* ofSoundPlayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofSoundPlayer.h; path = ../../../openFrameworks/sound/ofSoundPlayer.h; sourceTree = SOURCE_ROOT; }; + E4F3BA8412F4C4C9002D19BB /* ofSoundStream.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ofSoundStream.cpp; path = ../../../openFrameworks/sound/ofSoundStream.cpp; sourceTree = SOURCE_ROOT; }; + E4F3BA8512F4C4C9002D19BB /* ofSoundStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofSoundStream.h; path = ../../../openFrameworks/sound/ofSoundStream.h; sourceTree = SOURCE_ROOT; }; + E4F3BAB312F4C72E002D19BB /* ofMath.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ofMath.cpp; path = ../../../openFrameworks/math/ofMath.cpp; sourceTree = SOURCE_ROOT; }; + E4F3BAB412F4C72E002D19BB /* ofMath.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofMath.h; path = ../../../openFrameworks/math/ofMath.h; sourceTree = SOURCE_ROOT; }; + E4F3BAB512F4C72E002D19BB /* ofMatrix3x3.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ofMatrix3x3.cpp; path = ../../../openFrameworks/math/ofMatrix3x3.cpp; sourceTree = SOURCE_ROOT; }; + E4F3BAB612F4C72E002D19BB /* ofMatrix3x3.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofMatrix3x3.h; path = ../../../openFrameworks/math/ofMatrix3x3.h; sourceTree = SOURCE_ROOT; }; + E4F3BAB712F4C72E002D19BB /* ofMatrix4x4.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ofMatrix4x4.cpp; path = ../../../openFrameworks/math/ofMatrix4x4.cpp; sourceTree = SOURCE_ROOT; }; + E4F3BAB812F4C72E002D19BB /* ofMatrix4x4.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofMatrix4x4.h; path = ../../../openFrameworks/math/ofMatrix4x4.h; sourceTree = SOURCE_ROOT; }; + E4F3BAB912F4C72F002D19BB /* ofQuaternion.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ofQuaternion.cpp; path = ../../../openFrameworks/math/ofQuaternion.cpp; sourceTree = SOURCE_ROOT; }; + E4F3BABA12F4C72F002D19BB /* ofQuaternion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofQuaternion.h; path = ../../../openFrameworks/math/ofQuaternion.h; sourceTree = SOURCE_ROOT; }; + E4F3BABB12F4C72F002D19BB /* ofVec2f.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ofVec2f.cpp; path = ../../../openFrameworks/math/ofVec2f.cpp; sourceTree = SOURCE_ROOT; }; + E4F3BABC12F4C72F002D19BB /* ofVec2f.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofVec2f.h; path = ../../../openFrameworks/math/ofVec2f.h; sourceTree = SOURCE_ROOT; }; + E4F3BABD12F4C72F002D19BB /* ofVec3f.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofVec3f.h; path = ../../../openFrameworks/math/ofVec3f.h; sourceTree = SOURCE_ROOT; }; + E4F3BABE12F4C72F002D19BB /* ofVec4f.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ofVec4f.cpp; path = ../../../openFrameworks/math/ofVec4f.cpp; sourceTree = SOURCE_ROOT; }; + E4F3BABF12F4C72F002D19BB /* ofVec4f.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofVec4f.h; path = ../../../openFrameworks/math/ofVec4f.h; sourceTree = SOURCE_ROOT; }; + E4F3BAC012F4C72F002D19BB /* ofVectorMath.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofVectorMath.h; path = ../../../openFrameworks/math/ofVectorMath.h; sourceTree = SOURCE_ROOT; }; + E4F3BAD012F4C73C002D19BB /* ofBaseTypes.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ofBaseTypes.cpp; path = ../../../openFrameworks/types/ofBaseTypes.cpp; sourceTree = SOURCE_ROOT; }; + E4F3BAD212F4C73C002D19BB /* ofColor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ofColor.cpp; path = ../../../openFrameworks/types/ofColor.cpp; sourceTree = SOURCE_ROOT; }; + E4F3BAD312F4C73C002D19BB /* ofColor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofColor.h; path = ../../../openFrameworks/types/ofColor.h; sourceTree = SOURCE_ROOT; }; + E4F3BAD512F4C73C002D19BB /* ofPoint.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofPoint.h; path = ../../../openFrameworks/types/ofPoint.h; sourceTree = SOURCE_ROOT; }; + E4F3BAD612F4C73C002D19BB /* ofRectangle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ofRectangle.cpp; path = ../../../openFrameworks/types/ofRectangle.cpp; sourceTree = SOURCE_ROOT; }; + E4F3BAD712F4C73C002D19BB /* ofRectangle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofRectangle.h; path = ../../../openFrameworks/types/ofRectangle.h; sourceTree = SOURCE_ROOT; }; + E4F3BAD812F4C73C002D19BB /* ofTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofTypes.h; path = ../../../openFrameworks/types/ofTypes.h; sourceTree = SOURCE_ROOT; }; + E4F3BAE312F4C745002D19BB /* ofConstants.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofConstants.h; path = ../../../openFrameworks/utils/ofConstants.h; sourceTree = SOURCE_ROOT; }; + E4F3BAE412F4C745002D19BB /* ofFileUtils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ofFileUtils.cpp; path = ../../../openFrameworks/utils/ofFileUtils.cpp; sourceTree = SOURCE_ROOT; }; + E4F3BAE512F4C745002D19BB /* ofFileUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofFileUtils.h; path = ../../../openFrameworks/utils/ofFileUtils.h; sourceTree = SOURCE_ROOT; }; + E4F3BAE612F4C745002D19BB /* ofLog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ofLog.cpp; path = ../../../openFrameworks/utils/ofLog.cpp; sourceTree = SOURCE_ROOT; }; + E4F3BAE712F4C745002D19BB /* ofLog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofLog.h; path = ../../../openFrameworks/utils/ofLog.h; sourceTree = SOURCE_ROOT; }; + E4F3BAE812F4C745002D19BB /* ofNoise.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofNoise.h; path = ../../../openFrameworks/utils/ofNoise.h; sourceTree = SOURCE_ROOT; }; + E4F3BAE912F4C745002D19BB /* ofSystemUtils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ofSystemUtils.cpp; path = ../../../openFrameworks/utils/ofSystemUtils.cpp; sourceTree = SOURCE_ROOT; }; + E4F3BAEA12F4C745002D19BB /* ofSystemUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofSystemUtils.h; path = ../../../openFrameworks/utils/ofSystemUtils.h; sourceTree = SOURCE_ROOT; }; + E4F3BAEB12F4C745002D19BB /* ofThread.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ofThread.cpp; path = ../../../openFrameworks/utils/ofThread.cpp; sourceTree = SOURCE_ROOT; }; + E4F3BAEC12F4C745002D19BB /* ofThread.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofThread.h; path = ../../../openFrameworks/utils/ofThread.h; sourceTree = SOURCE_ROOT; }; + E4F3BAED12F4C745002D19BB /* ofURLFileLoader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ofURLFileLoader.cpp; path = ../../../openFrameworks/utils/ofURLFileLoader.cpp; sourceTree = SOURCE_ROOT; }; + E4F3BAEE12F4C745002D19BB /* ofURLFileLoader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofURLFileLoader.h; path = ../../../openFrameworks/utils/ofURLFileLoader.h; sourceTree = SOURCE_ROOT; }; + E4F3BAEF12F4C745002D19BB /* ofUtils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ofUtils.cpp; path = ../../../openFrameworks/utils/ofUtils.cpp; sourceTree = SOURCE_ROOT; }; + E4F3BAF012F4C745002D19BB /* ofUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofUtils.h; path = ../../../openFrameworks/utils/ofUtils.h; sourceTree = SOURCE_ROOT; }; + E4F3BB0012F4C751002D19BB /* ofBitmapFont.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ofBitmapFont.cpp; path = ../../../openFrameworks/graphics/ofBitmapFont.cpp; sourceTree = SOURCE_ROOT; }; + E4F3BB0112F4C751002D19BB /* ofBitmapFont.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofBitmapFont.h; path = ../../../openFrameworks/graphics/ofBitmapFont.h; sourceTree = SOURCE_ROOT; }; + E4F3BB0412F4C752002D19BB /* ofGraphics.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ofGraphics.cpp; path = ../../../openFrameworks/graphics/ofGraphics.cpp; sourceTree = SOURCE_ROOT; }; + E4F3BB0512F4C752002D19BB /* ofGraphics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofGraphics.h; path = ../../../openFrameworks/graphics/ofGraphics.h; sourceTree = SOURCE_ROOT; }; + E4F3BB0612F4C752002D19BB /* ofImage.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ofImage.cpp; path = ../../../openFrameworks/graphics/ofImage.cpp; sourceTree = SOURCE_ROOT; }; + E4F3BB0712F4C752002D19BB /* ofImage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofImage.h; path = ../../../openFrameworks/graphics/ofImage.h; sourceTree = SOURCE_ROOT; }; + E4F3BB0812F4C752002D19BB /* ofPixels.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ofPixels.cpp; path = ../../../openFrameworks/graphics/ofPixels.cpp; sourceTree = SOURCE_ROOT; }; + E4F3BB0912F4C752002D19BB /* ofPixels.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofPixels.h; path = ../../../openFrameworks/graphics/ofPixels.h; sourceTree = SOURCE_ROOT; }; + E4F3BB1212F4C752002D19BB /* ofTessellator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ofTessellator.cpp; path = ../../../openFrameworks/graphics/ofTessellator.cpp; sourceTree = SOURCE_ROOT; }; + E4F3BB1312F4C752002D19BB /* ofTessellator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofTessellator.h; path = ../../../openFrameworks/graphics/ofTessellator.h; sourceTree = SOURCE_ROOT; }; + E4F3BB1612F4C752002D19BB /* ofTrueTypeFont.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ofTrueTypeFont.cpp; path = ../../../openFrameworks/graphics/ofTrueTypeFont.cpp; sourceTree = SOURCE_ROOT; }; + E4F3BB1712F4C752002D19BB /* ofTrueTypeFont.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofTrueTypeFont.h; path = ../../../openFrameworks/graphics/ofTrueTypeFont.h; sourceTree = SOURCE_ROOT; }; /* End PBXFileReference section */ -/* Begin PBXFileSystemSynchronizedBuildFileExceptionSet section */ - 03EF26B12CD5D9FD005A5E4D /* PBXFileSystemSynchronizedBuildFileExceptionSet */ = { - isa = PBXFileSystemSynchronizedBuildFileExceptionSet; - membershipExceptions = ( - app/ofAppEGLWindow.cpp, - app/ofAppEGLWindow.h, - app/ofIcon.h, - communication/ofArduino.cpp, - communication/ofArduino.h, - math/ofMatrix3x3.cpp, - math/ofMatrix3x3.h, - math/ofMatrix4x4.cpp, - math/ofMatrix4x4.h, - math/ofQuaternion.cpp, - math/ofQuaternion.h, - math/ofVec2f.cpp, - math/ofVec2f.h, - math/ofVec3f.h, - math/ofVec4f.cpp, - math/ofVec4f.h, - math/ofVectorMath.h, - sound/ofFmodSoundPlayer.cpp, - sound/ofFmodSoundPlayer.h, - sound/ofMediaFoundationSoundPlayer.cpp, - sound/ofMediaFoundationSoundPlayer.h, - sound/ofOpenALSoundPlayer.cpp, - sound/ofOpenALSoundPlayer.h, - sound/ofRtAudioSoundStream.cpp, - sound/ofRtAudioSoundStream.h, - types/ofPoint.h, - video/ofDirectShowGrabber.cpp, - video/ofDirectShowGrabber.h, - video/ofDirectShowPlayer.cpp, - video/ofDirectShowPlayer.h, - video/ofGstUtils.cpp, - video/ofGstUtils.h, - video/ofGstVideoGrabber.cpp, - video/ofGstVideoGrabber.h, - video/ofGstVideoPlayer.cpp, - video/ofGstVideoPlayer.h, - video/ofMediaFoundationPlayer.cpp, - video/ofMediaFoundationPlayer.h, - ); - target = E4B27C1410CBEB8E00536013 /* openFrameworks */; - }; -/* End PBXFileSystemSynchronizedBuildFileExceptionSet section */ - -/* Begin PBXFileSystemSynchronizedRootGroup section */ - 03EF25F52CD5D9C4005A5E4D /* openFrameworks */ = {isa = PBXFileSystemSynchronizedRootGroup; exceptions = (03EF26B12CD5D9FD005A5E4D /* PBXFileSystemSynchronizedBuildFileExceptionSet */, ); explicitFileTypes = {app/ofAppGLFWWindow.cpp = sourcecode.cpp.objcpp; }; explicitFolders = (); name = openFrameworks; path = ../../../openFrameworks; sourceTree = ""; }; -/* End PBXFileSystemSynchronizedRootGroup section */ - /* Begin PBXFrameworksBuildPhase section */ E4B27C1310CBEB8E00536013 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 031A7A6E2CD5F34A00797180 /* zlib.xcframework in Frameworks */, - 037A65F92CD72C1000CF8AC1 /* brotli.xcframework in Frameworks */, - 031A7A6A2CD5F34500797180 /* tess2.xcframework in Frameworks */, - 031A7A622CD5F33F00797180 /* openssl.xcframework in Frameworks */, - 031A7A542CD5F33300797180 /* cairo.xcframework in Frameworks */, - 031A7A5C2CD5F33B00797180 /* glew.xcframework in Frameworks */, - 031A7A642CD5F34100797180 /* pixman.xcframework in Frameworks */, - 031A7A5A2CD5F33700797180 /* freetype.xcframework in Frameworks */, - 031A7A682CD5F34500797180 /* rtAudio.xcframework in Frameworks */, - 031A7A602CD5F33E00797180 /* libpng.xcframework in Frameworks */, - 031A7A582CD5F33600797180 /* FreeImage.xcframework in Frameworks */, - 031A7A5E2CD5F33C00797180 /* glfw.xcframework in Frameworks */, - 031A7A6C2CD5F34A00797180 /* uriparser.xcframework in Frameworks */, - 031A7A562CD5F33400797180 /* curl.xcframework in Frameworks */, - 031A7A662CD5F34200797180 /* pugixml.xcframework in Frameworks */, + BFB0B3F52C50DFE8008FB5A3 /* brotli.xcframework in Frameworks */, + BFB0B3F62C50DFE8008FB5A3 /* curl.xcframework in Frameworks */, + BFB0B3F72C50DFE8008FB5A3 /* openssl.xcframework in Frameworks */, + BFB0B3F82C50DFE8008FB5A3 /* pixman.xcframework in Frameworks */, + BFB0B3F92C50DFE8008FB5A3 /* libpng.xcframework in Frameworks */, + BFB0B3FA2C50DFE8008FB5A3 /* glfw.xcframework in Frameworks */, + BFB0B3FB2C50DFE8008FB5A3 /* glew.xcframework in Frameworks */, + BFB0B3FC2C50DFE8008FB5A3 /* freetype.xcframework in Frameworks */, + BFB0B3FD2C50DFE8008FB5A3 /* FreeImage.xcframework in Frameworks */, + BFB0B3FE2C50DFE8008FB5A3 /* cairo.xcframework in Frameworks */, + BFB0B3FF2C50DFE8008FB5A3 /* pugixml.xcframework in Frameworks */, + BFB0B4002C50DFE8008FB5A3 /* rtAudio.xcframework in Frameworks */, + BFB0B4012C50DFE8008FB5A3 /* tess2.xcframework in Frameworks */, + BFB0B4022C50DFE8008FB5A3 /* uriparser.xcframework in Frameworks */, + BFB0B4032C50DFE8008FB5A3 /* zlib.xcframework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -146,22 +415,302 @@ name = frameworks; sourceTree = ""; }; + BF879F602C0F7FE400200951 /* Frameworks */ = { + isa = PBXGroup; + children = ( + ); + name = Frameworks; + sourceTree = ""; + }; + DACFA8C8132D09C7008D4B7A /* gl */ = { + isa = PBXGroup; + children = ( + 694425151FE4544C00770088 /* ofGLBaseTypes.h */, + 2292E73C19E3049700DE9411 /* ofBufferObject.cpp */, + 2292E73D19E3049700DE9411 /* ofBufferObject.h */, + 2E498911292C96340096EC56 /* ofCubeMap.cpp */, + 2E498913292C96340096EC56 /* ofCubeMap.h */, + 2E498912292C96340096EC56 /* ofCubeMapShaders.h */, + 22246D91176C9987008A8AF4 /* ofGLProgrammableRenderer.cpp */, + 22246D92176C9987008A8AF4 /* ofGLProgrammableRenderer.h */, + DACFA8C9132D09E8008D4B7A /* ofFbo.cpp */, + DACFA8CA132D09E8008D4B7A /* ofFbo.h */, + DACFA8CB132D09E8008D4B7A /* ofGLRenderer.cpp */, + DACFA8CC132D09E8008D4B7A /* ofGLRenderer.h */, + 67D96B941651AF6D00D5242D /* ofGLUtils.cpp */, + DACFA8CD132D09E8008D4B7A /* ofGLUtils.h */, + DACFA8CE132D09E8008D4B7A /* ofLight.cpp */, + DACFA8CF132D09E8008D4B7A /* ofLight.h */, + 2E4D30C028F5BA9C0074D450 /* ofShadow.cpp */, + 2E4D30BF28F5BA9C0074D450 /* ofShadow.h */, + DACFA8D0132D09E8008D4B7A /* ofMaterial.cpp */, + DACFA8D1132D09E8008D4B7A /* ofMaterial.h */, + DACFA8D2132D09E8008D4B7A /* ofShader.cpp */, + DACFA8D3132D09E8008D4B7A /* ofShader.h */, + DACFA8D4132D09E8008D4B7A /* ofTexture.cpp */, + DACFA8D5132D09E8008D4B7A /* ofTexture.h */, + DACFA8D6132D09E8008D4B7A /* ofVbo.cpp */, + DACFA8D7132D09E8008D4B7A /* ofVbo.h */, + DACFA8D8132D09E8008D4B7A /* ofVboMesh.cpp */, + DACFA8D9132D09E8008D4B7A /* ofVboMesh.h */, + ); + name = gl; + sourceTree = ""; + }; + E4B27AAA10CBE92A00536013 /* openFrameworks */ = { + isa = PBXGroup; + children = ( + E4B27AC710CBE92A00536013 /* ofMain.h */, + E4F3BA5212F4C4BF002D19BB /* 3d */, + E4B27AAB10CBE92A00536013 /* app */, + E4B27AB210CBE92A00536013 /* communication */, + E4B27AB910CBE92A00536013 /* events */, + DACFA8C8132D09C7008D4B7A /* gl */, + E4F3BAFF12F4C751002D19BB /* graphics */, + E4F3BA7B12F4C4C9002D19BB /* sound */, + E4F3BAB212F4C72E002D19BB /* math */, + E4F3BACF12F4C73C002D19BB /* types */, + E4F3BAE212F4C745002D19BB /* utils */, + E4B27AD510CBE92A00536013 /* video */, + ); + name = openFrameworks; + path = ../../../openFrameworks; + sourceTree = SOURCE_ROOT; + }; + E4B27AAB10CBE92A00536013 /* app */ = { + isa = PBXGroup; + children = ( + 9979E81F1A1CCC44007E55D1 /* ofWindowSettings.h */, + 9979E8201A1CCC44007E55D1 /* ofMainLoop.cpp */, + 9979E8211A1CCC44007E55D1 /* ofMainLoop.h */, + E495DF7B178896A900994238 /* ofAppNoWindow.cpp */, + E495DF7C178896A900994238 /* ofAppNoWindow.h */, + 22FAD01C17049373002A7EB3 /* ofAppGLFWWindow.cpp */, + 22FAD01D17049373002A7EB3 /* ofAppGLFWWindow.h */, + E4B27AAC10CBE92A00536013 /* ofAppBaseWindow.h */, + E4B27AAF10CBE92A00536013 /* ofAppRunner.cpp */, + E4B27AB010CBE92A00536013 /* ofAppRunner.h */, + E4B27AB110CBE92A00536013 /* ofBaseApp.h */, + BBA81C421FFBE4DB0064EA94 /* ofBaseApp.cpp */, + ); + name = app; + path = ../../../openFrameworks/app; + sourceTree = SOURCE_ROOT; + }; + E4B27AB210CBE92A00536013 /* communication */ = { + isa = PBXGroup; + children = ( + E4B27AB310CBE92A00536013 /* ofArduino.cpp */, + E4B27AB410CBE92A00536013 /* ofArduino.h */, + E4B27AB510CBE92A00536013 /* ofSerial.cpp */, + E4B27AB610CBE92A00536013 /* ofSerial.h */, + ); + name = communication; + path = ../../../openFrameworks/communication; + sourceTree = SOURCE_ROOT; + }; + E4B27AB910CBE92A00536013 /* events */ = { + isa = PBXGroup; + children = ( + 229EB9A51B3181C800FF7B5F /* ofEvent.h */, + E4998A25128A39480094AC3F /* ofEvents.cpp */, + E4B27ABA10CBE92A00536013 /* ofEvents.h */, + E4B27ABB10CBE92A00536013 /* ofEventUtils.h */, + ); + name = events; + path = ../../../openFrameworks/events; + sourceTree = SOURCE_ROOT; + }; + E4B27AD510CBE92A00536013 /* video */ = { + isa = PBXGroup; + children = ( + 694425211FE456AF00770088 /* ofVideoBaseTypes.h */, + E4B27ADB10CBE92A00536013 /* ofVideoGrabber.cpp */, + E4B27ADC10CBE92A00536013 /* ofVideoGrabber.h */, + E4B27ADD10CBE92A00536013 /* ofVideoPlayer.cpp */, + E4B27ADE10CBE92A00536013 /* ofVideoPlayer.h */, + E48662991D8C61B000D1735C /* ofAVFoundationGrabber.mm */, + E48662981D8C61B000D1735C /* ofAVFoundationGrabber.h */, + 6766729F1A749D1900400051 /* ofAVFoundationVideoPlayer.h */, + 6766729D1A749D1900400051 /* ofAVFoundationVideoPlayer.m */, + 6766729E1A749D1900400051 /* ofAVFoundationPlayer.h */, + 676672A21A749D1900400051 /* ofAVFoundationPlayer.mm */, + ); + name = video; + path = ../../../openFrameworks/video; + sourceTree = SOURCE_ROOT; + }; E4B69B4A0A3A1720003C02F2 = { isa = PBXGroup; children = ( - 03EF25F52CD5D9C4005A5E4D /* openFrameworks */, E4EB6916138AFC8500A09F29 /* CoreOF.xcconfig */, E432815E138ABFDD0047C5CB /* Shared.xcconfig */, E432815F138AC0470047C5CB /* Debug.xcconfig */, E4328160138AC04A0047C5CB /* Release.xcconfig */, + E4B27AAA10CBE92A00536013 /* openFrameworks */, E4B27C1510CBEB8E00536013 /* openFrameworksDebug.a */, BF5BF83E2B7378ED0049DEF6 /* frameworks */, + BF879F602C0F7FE400200951 /* Frameworks */, ); indentWidth = 4; sourceTree = ""; tabWidth = 4; usesTabs = 1; }; + E4F3BA5212F4C4BF002D19BB /* 3d */ = { + isa = PBXGroup; + children = ( + E4F3BA5312F4C4BF002D19BB /* of3dUtils.cpp */, + E4F3BA5412F4C4BF002D19BB /* of3dUtils.h */, + E4F3BA5512F4C4BF002D19BB /* ofCamera.cpp */, + E4F3BA5612F4C4BF002D19BB /* ofCamera.h */, + E4F3BA5712F4C4BF002D19BB /* ofEasyCam.cpp */, + E4F3BA5812F4C4BF002D19BB /* ofEasyCam.h */, + 6448E6FB1CAD7679000877BC /* ofMesh.inl */, + 53EEEF49130766EF0027C199 /* ofMesh.h */, + E4F3BA5F12F4C4BF002D19BB /* ofNode.cpp */, + E4F3BA6012F4C4BF002D19BB /* ofNode.h */, + 2E6EA7051603AABD00B7ADF3 /* of3dPrimitives.h */, + 2E6EA7071603AAD600B7ADF3 /* of3dPrimitives.cpp */, + ); + name = 3d; + path = ../../../openFrameworks/3d; + sourceTree = SOURCE_ROOT; + }; + E4F3BA7B12F4C4C9002D19BB /* sound */ = { + isa = PBXGroup; + children = ( + E43EEAC229E66B78001C7596 /* ofAVEngineSoundPlayer.h */, + E43EEAC129E66B78001C7596 /* ofAVEngineSoundPlayer.mm */, + 6944251D1FE4548B00770088 /* ofSoundBaseTypes.cpp */, + 6944251E1FE4548B00770088 /* ofSoundBaseTypes.h */, + E4F3BA7E12F4C4C9002D19BB /* ofFmodSoundPlayer.cpp */, + E4F3BA7F12F4C4C9002D19BB /* ofFmodSoundPlayer.h */, + 772BDF71146928600030F0EE /* ofOpenALSoundPlayer.cpp */, + 772BDF72146928600030F0EE /* ofOpenALSoundPlayer.h */, + E4C5E386131AC1B10050F992 /* ofRtAudioSoundStream.cpp */, + E4C5E385131AC1B10050F992 /* ofRtAudioSoundStream.h */, + 6678E96D19FEAFA900C00581 /* ofSoundBuffer.cpp */, + 6678E96E19FEAFA900C00581 /* ofSoundBuffer.h */, + E4F3BA8212F4C4C9002D19BB /* ofSoundPlayer.cpp */, + E4F3BA8312F4C4C9002D19BB /* ofSoundPlayer.h */, + E4F3BA8412F4C4C9002D19BB /* ofSoundStream.cpp */, + E4F3BA8512F4C4C9002D19BB /* ofSoundStream.h */, + 6678E97C19FEB5A600C00581 /* ofSoundUtils.h */, + ); + name = sound; + path = ../../../openFrameworks/sound; + sourceTree = SOURCE_ROOT; + }; + E4F3BAB212F4C72E002D19BB /* math */ = { + isa = PBXGroup; + children = ( + 30CC5384207A36FD008234AF /* ofMathConstants.h */, + E4F3BAB312F4C72E002D19BB /* ofMath.cpp */, + E4F3BAB412F4C72E002D19BB /* ofMath.h */, + E4F3BAB512F4C72E002D19BB /* ofMatrix3x3.cpp */, + E4F3BAB612F4C72E002D19BB /* ofMatrix3x3.h */, + E4F3BAB712F4C72E002D19BB /* ofMatrix4x4.cpp */, + E4F3BAB812F4C72E002D19BB /* ofMatrix4x4.h */, + E4F3BAB912F4C72F002D19BB /* ofQuaternion.cpp */, + E4F3BABA12F4C72F002D19BB /* ofQuaternion.h */, + E4F3BABB12F4C72F002D19BB /* ofVec2f.cpp */, + E4F3BABC12F4C72F002D19BB /* ofVec2f.h */, + E4F3BABD12F4C72F002D19BB /* ofVec3f.h */, + E4F3BABE12F4C72F002D19BB /* ofVec4f.cpp */, + E4F3BABF12F4C72F002D19BB /* ofVec4f.h */, + E4F3BAC012F4C72F002D19BB /* ofVectorMath.h */, + ); + name = math; + path = ../../../openFrameworks/math; + sourceTree = SOURCE_ROOT; + }; + E4F3BACF12F4C73C002D19BB /* types */ = { + isa = PBXGroup; + children = ( + BF6276A52BAD9900008864C1 /* ofBaseTypes.h */, + DAC22D3B16E7A4AF0020226D /* ofParameter.cpp */, + DAC22D3C16E7A4AF0020226D /* ofParameter.h */, + DAC22D3D16E7A4AF0020226D /* ofParameterGroup.cpp */, + E4F3BAD012F4C73C002D19BB /* ofBaseTypes.cpp */, + E4F3BAD212F4C73C002D19BB /* ofColor.cpp */, + E4F3BAD312F4C73C002D19BB /* ofColor.h */, + E4F3BAD512F4C73C002D19BB /* ofPoint.h */, + E4F3BAD612F4C73C002D19BB /* ofRectangle.cpp */, + E4F3BAD712F4C73C002D19BB /* ofRectangle.h */, + E4F3BAD812F4C73C002D19BB /* ofTypes.h */, + ); + name = types; + path = ../../../openFrameworks/types; + sourceTree = SOURCE_ROOT; + }; + E4F3BAE212F4C745002D19BB /* utils */ = { + isa = PBXGroup; + children = ( + 692C298719DC5C5500C27C5D /* ofFpsCounter.cpp */, + 692C298819DC5C5500C27C5D /* ofFpsCounter.h */, + 692C298919DC5C5500C27C5D /* ofTimer.cpp */, + 692C298A19DC5C5500C27C5D /* ofTimer.h */, + 0353245C2BEFEC7B00B50A35 /* ofTimerFps.cpp */, + 0353245B2BEFEC7A00B50A35 /* ofTimerFps.h */, + 27DEA30F1796F578000A9E90 /* ofXml.cpp */, + 27DEA3101796F578000A9E90 /* ofXml.h */, + 2276958F170D9DD200604FC3 /* ofMatrixStack.cpp */, + 22769590170D9DD200604FC3 /* ofMatrixStack.h */, + E4F3BAE312F4C745002D19BB /* ofConstants.h */, + E4F3BAE412F4C745002D19BB /* ofFileUtils.cpp */, + E4F3BAE512F4C745002D19BB /* ofFileUtils.h */, + E4F3BAE612F4C745002D19BB /* ofLog.cpp */, + E4F3BAE712F4C745002D19BB /* ofLog.h */, + E4F3BAE812F4C745002D19BB /* ofNoise.h */, + E4F3BAE912F4C745002D19BB /* ofSystemUtils.cpp */, + E4F3BAEA12F4C745002D19BB /* ofSystemUtils.h */, + E4F3BAEB12F4C745002D19BB /* ofThread.cpp */, + E4F3BAEC12F4C745002D19BB /* ofThread.h */, + E4F3BAED12F4C745002D19BB /* ofURLFileLoader.cpp */, + E4F3BAEE12F4C745002D19BB /* ofURLFileLoader.h */, + E4F3BAEF12F4C745002D19BB /* ofUtils.cpp */, + E4F3BAF012F4C745002D19BB /* ofUtils.h */, + ); + name = utils; + path = ../../../openFrameworks/utils; + sourceTree = SOURCE_ROOT; + }; + E4F3BAFF12F4C751002D19BB /* graphics */ = { + isa = PBXGroup; + children = ( + 694425171FE4547400770088 /* ofGraphicsBaseTypes.cpp */, + 694425181FE4547400770088 /* ofGraphicsBaseTypes.h */, + 694425191FE4547400770088 /* ofGraphicsConstants.h */, + 92C55F86132DA7DD00EC2631 /* ofPath.cpp */, + 92C55F87132DA7DD00EC2631 /* ofPath.h */, + 6448E6FC1CAD771D000877BC /* ofPolyline.inl */, + DA48FE74131D85A6000062BC /* ofPolyline.h */, + DA94C2ED1301D32200CCC773 /* ofRendererCollection.h */, + 22A1C452170AFCB60079E473 /* ofRendererCollection.cpp */, + DA97FD3612F5A61A005C9991 /* ofCairoRenderer.cpp */, + DA97FD3712F5A61A005C9991 /* ofCairoRenderer.h */, + E4F3BB0012F4C751002D19BB /* ofBitmapFont.cpp */, + E4F3BB0112F4C751002D19BB /* ofBitmapFont.h */, + E4F3BB0412F4C752002D19BB /* ofGraphics.cpp */, + E4F3BB0512F4C752002D19BB /* ofGraphics.h */, + 19662F2D2834A44400B622ED /* ofGraphicsCairo.cpp */, + 19662F2C2834A44400B622ED /* ofGraphicsCairo.h */, + 2E6EA7031603AA7A00B7ADF3 /* of3dGraphics.cpp */, + 2E6EA7001603A9E400B7ADF3 /* of3dGraphics.h */, + E4F3BB0612F4C752002D19BB /* ofImage.cpp */, + E4F3BB0712F4C752002D19BB /* ofImage.h */, + E4F3BB0812F4C752002D19BB /* ofPixels.cpp */, + E4F3BB0912F4C752002D19BB /* ofPixels.h */, + E4F3BB1212F4C752002D19BB /* ofTessellator.cpp */, + E4F3BB1312F4C752002D19BB /* ofTessellator.h */, + E4F3BB1612F4C752002D19BB /* ofTrueTypeFont.cpp */, + E4F3BB1712F4C752002D19BB /* ofTrueTypeFont.h */, + ); + name = graphics; + path = ../../../openFrameworks/graphics; + sourceTree = SOURCE_ROOT; + }; /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ @@ -169,6 +718,87 @@ isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( + 692C298E19DC5C5500C27C5D /* ofTimer.h in Headers */, + E4F3BA6812F4C4BF002D19BB /* of3dUtils.h in Headers */, + 30CC5385207A36FD008234AF /* ofMathConstants.h in Headers */, + E4F3BA6A12F4C4BF002D19BB /* ofCamera.h in Headers */, + E4F3BA6C12F4C4BF002D19BB /* ofEasyCam.h in Headers */, + 0353245D2BEFEC7B00B50A35 /* ofTimerFps.h in Headers */, + E4F3BA7412F4C4BF002D19BB /* ofNode.h in Headers */, + E4F3BA8B12F4C4C9002D19BB /* ofFmodSoundPlayer.h in Headers */, + E4F3BA8F12F4C4C9002D19BB /* ofSoundPlayer.h in Headers */, + E4F3BA9112F4C4C9002D19BB /* ofSoundStream.h in Headers */, + E4F3BAC212F4C72F002D19BB /* ofMath.h in Headers */, + E4F3BAC412F4C72F002D19BB /* ofMatrix3x3.h in Headers */, + 676672A41A749D1900400051 /* ofAVFoundationPlayer.h in Headers */, + 6678E97019FEAFA900C00581 /* ofSoundBuffer.h in Headers */, + 9979E8241A1CCC44007E55D1 /* ofMainLoop.h in Headers */, + E4F3BAC612F4C72F002D19BB /* ofMatrix4x4.h in Headers */, + E4F3BAC812F4C72F002D19BB /* ofQuaternion.h in Headers */, + E4F3BACA12F4C72F002D19BB /* ofVec2f.h in Headers */, + E4F3BACB12F4C72F002D19BB /* ofVec3f.h in Headers */, + E4F3BACD12F4C72F002D19BB /* ofVec4f.h in Headers */, + 692C298C19DC5C5500C27C5D /* ofFpsCounter.h in Headers */, + E4F3BACE12F4C72F002D19BB /* ofVectorMath.h in Headers */, + 6678E97F19FEB5A600C00581 /* ofSoundUtils.h in Headers */, + 6944251B1FE4547400770088 /* ofGraphicsBaseTypes.h in Headers */, + E4F3BADC12F4C73C002D19BB /* ofColor.h in Headers */, + 694425161FE4544C00770088 /* ofGLBaseTypes.h in Headers */, + E4F3BADE12F4C73C002D19BB /* ofPoint.h in Headers */, + E4F3BAE012F4C73C002D19BB /* ofRectangle.h in Headers */, + 19662F2E2834A44400B622ED /* ofGraphicsCairo.h in Headers */, + E4F3BAE112F4C73C002D19BB /* ofTypes.h in Headers */, + 6944251C1FE4547400770088 /* ofGraphicsConstants.h in Headers */, + E4F3BAF112F4C745002D19BB /* ofConstants.h in Headers */, + E4F3BAF312F4C745002D19BB /* ofFileUtils.h in Headers */, + E4F3BAF512F4C745002D19BB /* ofLog.h in Headers */, + E4F3BAF612F4C745002D19BB /* ofNoise.h in Headers */, + E4F3BAF812F4C745002D19BB /* ofSystemUtils.h in Headers */, + E4F3BAFA12F4C745002D19BB /* ofThread.h in Headers */, + 694425221FE456AF00770088 /* ofVideoBaseTypes.h in Headers */, + E4F3BAFC12F4C745002D19BB /* ofURLFileLoader.h in Headers */, + E4F3BAFE12F4C745002D19BB /* ofUtils.h in Headers */, + E4F3BB1912F4C752002D19BB /* ofBitmapFont.h in Headers */, + 2E498915292C96340096EC56 /* ofCubeMapShaders.h in Headers */, + E4F3BB1D12F4C752002D19BB /* ofGraphics.h in Headers */, + E4F3BB1F12F4C752002D19BB /* ofImage.h in Headers */, + E4F3BB2112F4C752002D19BB /* ofPixels.h in Headers */, + E4F3BB2B12F4C752002D19BB /* ofTessellator.h in Headers */, + 2E498916292C96340096EC56 /* ofCubeMap.h in Headers */, + E4F3BB2F12F4C752002D19BB /* ofTrueTypeFont.h in Headers */, + DA97FD3D12F5A61A005C9991 /* ofCairoRenderer.h in Headers */, + DA94C2F01301D32200CCC773 /* ofRendererCollection.h in Headers */, + 53EEEF4B130766EF0027C199 /* ofMesh.h in Headers */, + DA48FE78131D85A6000062BC /* ofPolyline.h in Headers */, + DACFA8DB132D09E8008D4B7A /* ofFbo.h in Headers */, + DACFA8DD132D09E8008D4B7A /* ofGLRenderer.h in Headers */, + DACFA8DE132D09E8008D4B7A /* ofGLUtils.h in Headers */, + 694425201FE4548B00770088 /* ofSoundBaseTypes.h in Headers */, + DACFA8E0132D09E8008D4B7A /* ofLight.h in Headers */, + DACFA8E2132D09E8008D4B7A /* ofMaterial.h in Headers */, + DACFA8E4132D09E8008D4B7A /* ofShader.h in Headers */, + 676672A51A749D1900400051 /* ofAVFoundationVideoPlayer.h in Headers */, + DACFA8E6132D09E8008D4B7A /* ofTexture.h in Headers */, + DACFA8E8132D09E8008D4B7A /* ofVbo.h in Headers */, + DACFA8EA132D09E8008D4B7A /* ofVboMesh.h in Headers */, + 9979E8221A1CCC44007E55D1 /* ofWindowSettings.h in Headers */, + 92C55F89132DA7DD00EC2631 /* ofPath.h in Headers */, + E4C5E387131AC1B10050F992 /* ofRtAudioSoundStream.h in Headers */, + 772BDF74146928600030F0EE /* ofOpenALSoundPlayer.h in Headers */, + E486629A1D8C61B000D1735C /* ofAVFoundationGrabber.h in Headers */, + DAC22D4016E7A4AF0020226D /* ofParameter.h in Headers */, + E43EEAC429E66B78001C7596 /* ofAVEngineSoundPlayer.h in Headers */, + BF6276A62BAD9900008864C1 /* ofBaseTypes.h in Headers */, + 2E6EA7011603A9E400B7ADF3 /* of3dGraphics.h in Headers */, + 2292E73F19E3049700DE9411 /* ofBufferObject.h in Headers */, + 2E6EA7061603AABD00B7ADF3 /* of3dPrimitives.h in Headers */, + 229EB9A61B3181C800FF7B5F /* ofEvent.h in Headers */, + 22FAD01F17049373002A7EB3 /* ofAppGLFWWindow.h in Headers */, + 2E4D30C128F5BA9C0074D450 /* ofShadow.h in Headers */, + 22769592170D9DD200604FC3 /* ofMatrixStack.h in Headers */, + 22246D94176C9987008A8AF4 /* ofGLProgrammableRenderer.h in Headers */, + E495DF7E178896A900994238 /* ofAppNoWindow.h in Headers */, + 27DEA3121796F578000A9E90 /* ofXml.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -189,9 +819,6 @@ ); dependencies = ( ); - fileSystemSynchronizedGroups = ( - 03EF25F52CD5D9C4005A5E4D /* openFrameworks */, - ); name = openFrameworks; productName = openFrameworksLib; productReference = E4B27C1510CBEB8E00536013 /* openFrameworksDebug.a */; @@ -273,6 +900,79 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( + E4B27C1910CBEB9D00536013 /* ofAppRunner.cpp in Sources */, + E4B27C1A10CBEB9D00536013 /* ofArduino.cpp in Sources */, + E4B27C1B10CBEB9D00536013 /* ofSerial.cpp in Sources */, + E4B27C2610CBEB9D00536013 /* ofVideoGrabber.cpp in Sources */, + E4B27C2710CBEB9D00536013 /* ofVideoPlayer.cpp in Sources */, + E4998A26128A39480094AC3F /* ofEvents.cpp in Sources */, + E4F3BA6712F4C4BF002D19BB /* of3dUtils.cpp in Sources */, + 6678E96F19FEAFA900C00581 /* ofSoundBuffer.cpp in Sources */, + E4F3BA6912F4C4BF002D19BB /* ofCamera.cpp in Sources */, + E4F3BA6B12F4C4BF002D19BB /* ofEasyCam.cpp in Sources */, + E4F3BA7312F4C4BF002D19BB /* ofNode.cpp in Sources */, + 6944251F1FE4548B00770088 /* ofSoundBaseTypes.cpp in Sources */, + 2292E73E19E3049700DE9411 /* ofBufferObject.cpp in Sources */, + E4F3BA8A12F4C4C9002D19BB /* ofFmodSoundPlayer.cpp in Sources */, + E4F3BA8E12F4C4C9002D19BB /* ofSoundPlayer.cpp in Sources */, + E4F3BA9012F4C4C9002D19BB /* ofSoundStream.cpp in Sources */, + E43EEAC329E66B78001C7596 /* ofAVEngineSoundPlayer.mm in Sources */, + E4F3BAC112F4C72F002D19BB /* ofMath.cpp in Sources */, + E4F3BAC312F4C72F002D19BB /* ofMatrix3x3.cpp in Sources */, + 6944251A1FE4547400770088 /* ofGraphicsBaseTypes.cpp in Sources */, + E4F3BAC512F4C72F002D19BB /* ofMatrix4x4.cpp in Sources */, + E4F3BAC712F4C72F002D19BB /* ofQuaternion.cpp in Sources */, + E4F3BAC912F4C72F002D19BB /* ofVec2f.cpp in Sources */, + E4F3BACC12F4C72F002D19BB /* ofVec4f.cpp in Sources */, + E4F3BAD912F4C73C002D19BB /* ofBaseTypes.cpp in Sources */, + 676672A31A749D1900400051 /* ofAVFoundationVideoPlayer.m in Sources */, + E4F3BADB12F4C73C002D19BB /* ofColor.cpp in Sources */, + E4F3BADF12F4C73C002D19BB /* ofRectangle.cpp in Sources */, + E4F3BAF212F4C745002D19BB /* ofFileUtils.cpp in Sources */, + 2E498914292C96340096EC56 /* ofCubeMap.cpp in Sources */, + E4F3BAF412F4C745002D19BB /* ofLog.cpp in Sources */, + BBA81C431FFBE4DB0064EA94 /* ofBaseApp.cpp in Sources */, + 9979E8231A1CCC44007E55D1 /* ofMainLoop.cpp in Sources */, + E4F3BAF712F4C745002D19BB /* ofSystemUtils.cpp in Sources */, + E4F3BAF912F4C745002D19BB /* ofThread.cpp in Sources */, + E4F3BAFB12F4C745002D19BB /* ofURLFileLoader.cpp in Sources */, + E4F3BAFD12F4C745002D19BB /* ofUtils.cpp in Sources */, + E4F3BB1812F4C752002D19BB /* ofBitmapFont.cpp in Sources */, + E4F3BB1C12F4C752002D19BB /* ofGraphics.cpp in Sources */, + 2E6EA7041603AA7A00B7ADF3 /* of3dGraphics.cpp in Sources */, + 0353245E2BEFEC7B00B50A35 /* ofTimerFps.cpp in Sources */, + E4F3BB1E12F4C752002D19BB /* ofImage.cpp in Sources */, + E4F3BB2012F4C752002D19BB /* ofPixels.cpp in Sources */, + E4F3BB2A12F4C752002D19BB /* ofTessellator.cpp in Sources */, + E4F3BB2E12F4C752002D19BB /* ofTrueTypeFont.cpp in Sources */, + DA97FD3C12F5A61A005C9991 /* ofCairoRenderer.cpp in Sources */, + DACFA8DA132D09E8008D4B7A /* ofFbo.cpp in Sources */, + E486629B1D8C61B000D1735C /* ofAVFoundationGrabber.mm in Sources */, + DACFA8DC132D09E8008D4B7A /* ofGLRenderer.cpp in Sources */, + 2E4D30C228F5BA9C0074D450 /* ofShadow.cpp in Sources */, + 2E6EA7081603AAD600B7ADF3 /* of3dPrimitives.cpp in Sources */, + DACFA8DF132D09E8008D4B7A /* ofLight.cpp in Sources */, + 692C298D19DC5C5500C27C5D /* ofTimer.cpp in Sources */, + DACFA8E1132D09E8008D4B7A /* ofMaterial.cpp in Sources */, + DACFA8E3132D09E8008D4B7A /* ofShader.cpp in Sources */, + DACFA8E5132D09E8008D4B7A /* ofTexture.cpp in Sources */, + DACFA8E7132D09E8008D4B7A /* ofVbo.cpp in Sources */, + DACFA8E9132D09E8008D4B7A /* ofVboMesh.cpp in Sources */, + 92C55F88132DA7DD00EC2631 /* ofPath.cpp in Sources */, + E4C5E388131AC1B10050F992 /* ofRtAudioSoundStream.cpp in Sources */, + 772BDF73146928600030F0EE /* ofOpenALSoundPlayer.cpp in Sources */, + DAC22D3F16E7A4AF0020226D /* ofParameter.cpp in Sources */, + DAC22D4116E7A4AF0020226D /* ofParameterGroup.cpp in Sources */, + 67D96B971651AF6D00D5242D /* ofGLUtils.cpp in Sources */, + 22FAD01E17049373002A7EB3 /* ofAppGLFWWindow.cpp in Sources */, + 22A1C453170AFCB60079E473 /* ofRendererCollection.cpp in Sources */, + 22769591170D9DD200604FC3 /* ofMatrixStack.cpp in Sources */, + 22246D93176C9987008A8AF4 /* ofGLProgrammableRenderer.cpp in Sources */, + 676672A81A749D1900400051 /* ofAVFoundationPlayer.mm in Sources */, + E495DF7D178896A900994238 /* ofAppNoWindow.cpp in Sources */, + 27DEA3111796F578000A9E90 /* ofXml.cpp in Sources */, + 692C298B19DC5C5500C27C5D /* ofFpsCounter.cpp in Sources */, + 19662F2F2834A44400B622ED /* ofGraphicsCairo.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -282,7 +982,6 @@ E4B27C1610CBEB8E00536013 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS)"; CONFIGURATION_BUILD_DIR = "$(SRCROOT)/../../lib/macos/"; EXECUTABLE_PREFIX = ""; INSTALL_PATH = /usr/local/lib; @@ -307,9 +1006,8 @@ E4B27C1710CBEB8E00536013 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS)"; CONFIGURATION_BUILD_DIR = "$(SRCROOT)/../../lib/macos/"; - DEBUG_INFORMATION_FORMAT = dwarf; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; EXECUTABLE_PREFIX = ""; INSTALL_PATH = /usr/local/lib; LIBRARY_SEARCH_PATHS = ( @@ -336,11 +1034,6 @@ buildSettings = { CONFIGURATION_BUILD_DIR = "$(SRCROOT)/../../lib/macos/"; CONFIGURATION_TEMP_DIR = "$(SRCROOT)/../../lib/macos/build/debug/"; - DEFINES_MODULE = YES; - LD_WARN_DUPLICATE_LIBRARIES = YES; - LD_WARN_UNUSED_DYLIBS = YES; - MERGEABLE_LIBRARY = YES; - MERGED_BINARY_TYPE = automatic; OBJROOT = "$(SRCROOT)/../../lib/macos/build/debug/"; ONLY_ACTIVE_ARCH = NO; SDKROOT = ""; @@ -353,11 +1046,6 @@ buildSettings = { CONFIGURATION_BUILD_DIR = "$(SRCROOT)/../../lib/macos/"; CONFIGURATION_TEMP_DIR = "$(SRCROOT)/../../lib/macos/build/release/"; - DEFINES_MODULE = YES; - LD_WARN_DUPLICATE_LIBRARIES = YES; - LD_WARN_UNUSED_DYLIBS = YES; - MERGEABLE_LIBRARY = YES; - MERGED_BINARY_TYPE = automatic; OBJROOT = "$(SRCROOT)/../../lib/macos/build/release"; ONLY_ACTIVE_ARCH = NO; SDKROOT = "";