Skip to content

Commit 5c6c4df

Browse files
danomatikadanomatika
committed
Merge branch 'master' of github.com:openframeworks/openFrameworks into update/log-and-docs-cleanup
2 parents f754498 + 87f1e5f commit 5c6c4df

File tree

30 files changed

+487
-346
lines changed

30 files changed

+487
-346
lines changed

‎.github/workflows/manual-nightly.yml renamed to ‎.github/workflows/manual-release.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# This one was created to make it work whil
22

3-
name: manual-nightly-ok
3+
name: manual-release
44

55
on:
66
workflow_dispatch:
@@ -67,8 +67,7 @@ jobs:
6767
with:
6868
token: ${{ secrets.GITHUB_TOKEN }}
6969
tag: ${{ github.event.inputs.release }}
70-
# release: ${{ github.event.inputs.release }}
71-
release: nightly
70+
release: ${{ github.event.inputs.release }}
7271
prerelease: false
7372
replace: true
7473
files: ${{ steps.createpackage.outputs.FILES_OUT }}

‎.github/workflows/of.yml

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -77,11 +77,11 @@ jobs:
7777
run: gcc -v
7878
- uses: actions/checkout@v4
7979
- name: ccache
80-
uses: hendrikmuhs/ccache-action@v1.2.14
80+
uses: hendrikmuhs/ccache-action@v1.2.17
8181
with:
8282
# key: ${{ matrix.os }}-${{ matrix.type }}
8383
key: ${{ matrix.msystem }}
84-
- uses: msys2/setup-msys2@v2.24.1
84+
- uses: msys2/setup-msys2@v2.27.0
8585
with:
8686
cache: true
8787
release: true
@@ -125,7 +125,7 @@ jobs:
125125
steps:
126126
- name: Clone repository
127127
uses: actions/checkout@v4
128-
- uses: msys2/setup-msys2@v2.24.1
128+
- uses: msys2/setup-msys2@v2.27.0
129129
with:
130130
update: true
131131
install: >-
@@ -171,8 +171,8 @@ jobs:
171171
steps:
172172
- name: Clone repository
173173
uses: actions/checkout@v4
174-
175-
- uses: msys2/setup-msys2@v2.24.1
174+
175+
- uses: msys2/setup-msys2@v2.27.0
176176
with:
177177
update: true
178178
install: >-
@@ -182,7 +182,7 @@ jobs:
182182
- name: Setup MSBuild (VS2019 - 16.11)
183183
uses: microsoft/setup-msbuild@v2
184184
with:
185-
vs-version: '16.11'
185+
vs-version: "16.11"
186186
msbuild-architecture: x64
187187

188188
- name: Verify MSBuild Version
@@ -216,7 +216,6 @@ jobs:
216216
# msbuild examples/templates/allAddonsExample/allAddonsExample.vcxproj /p:configuration=debug /p:platform=${{ matrix.platform }} /p:PlatformToolset=v142
217217
# msbuild examples/templates/allAddonsExample/allAddonsExample.vcxproj /p:configuration=release /p:platform=${{ matrix.platform }} /p:PlatformToolset=v142
218218

219-
220219
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
221220

222221
rpi-build:
@@ -254,7 +253,7 @@ jobs:
254253
version: 1.0
255254
- uses: actions/checkout@v4
256255
- name: ccache
257-
uses: hendrikmuhs/ccache-action@v1.2.14
256+
uses: hendrikmuhs/ccache-action@v1.2.17
258257
with:
259258
key: ${{ matrix.cfg.libs }}
260259
# - name: Determine Release
@@ -294,7 +293,7 @@ jobs:
294293
steps:
295294
- uses: actions/checkout@v4
296295
- name: ccache
297-
uses: hendrikmuhs/ccache-action@v1.2.14
296+
uses: hendrikmuhs/ccache-action@v1.2.17
298297
with:
299298
key: ${{ matrix.cfg.target }}-${{ matrix.cfg.libs }}
300299
# - name: Determine Release
@@ -331,11 +330,11 @@ jobs:
331330
env:
332331
TARGET: ${{matrix.cfg.target}}
333332
steps:
334-
# handled by the install script now
335-
# - name: Remove Old lib-unwind
336-
# run: if [ "$TARGET" = "linux64" ]; then
337-
# sudo apt-get remove libunwind-14 -y;
338-
# fi
333+
# handled by the install script now
334+
# - name: Remove Old lib-unwind
335+
# run: if [ "$TARGET" = "linux64" ]; then
336+
# sudo apt-get remove libunwind-14 -y;
337+
# fi
339338
- name: Cache Packages
340339
uses: awalsh128/cache-apt-pkgs-action@latest
341340
with:
@@ -356,7 +355,7 @@ jobs:
356355
# fi
357356
- uses: actions/checkout@v4
358357
- name: ccache
359-
uses: hendrikmuhs/ccache-action@v1.2.14
358+
uses: hendrikmuhs/ccache-action@v1.2.17
360359
with:
361360
key: ${{ matrix.cfg.target }}-${{ matrix.cfg.libs }}
362361

@@ -395,7 +394,7 @@ jobs:
395394

396395
# - uses: actions/checkout@v4
397396
# - name: ccache
398-
# uses: hendrikmuhs/ccache-action@v1.2.14
397+
# uses: hendrikmuhs/ccache-action@v1.2.17
399398
# with:
400399
# key: ${{ matrix.cfg.target }}-${{ matrix.cfg.libs }}
401400

@@ -423,7 +422,7 @@ jobs:
423422
steps:
424423
- uses: actions/checkout@v4
425424
- name: ccache
426-
uses: hendrikmuhs/ccache-action@v1.2.14
425+
uses: hendrikmuhs/ccache-action@v1.2.17
427426
with:
428427
key: ${{ matrix.cfg.target }}-${{ matrix.cfg.opt }}
429428

@@ -477,8 +476,8 @@ jobs:
477476
- name: Set Up JDK 17
478477
uses: actions/setup-java@v3
479478
with:
480-
distribution: 'temurin'
481-
java-version: '17'
479+
distribution: "temurin"
480+
java-version: "17"
482481

483482
- name: Download Libraries
484483
run: ./of update libs android
@@ -504,4 +503,3 @@ jobs:
504503
echo "ERROR: Build Failed not found: [$LIB_PATH]"
505504
exit 1
506505
fi
507-

‎addons/ofxAssimp/src/Source/ofxAssimpSrcBone.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ void SrcBone::findBoneRecursive( aiNode* aAiNode, std::shared_ptr<SrcBone>& retu
4949

5050
//--------------------------------------------------------------
5151
unsigned int SrcBone::getNumBones() {
52-
unsigned int ttotal = childBones.size();
52+
unsigned int ttotal = (unsigned int)childBones.size();
5353
for(auto& kid : childBones ) {
5454
ttotal += kid->getNumBones();
5555
}

‎addons/ofxAssimp/src/Source/ofxAssimpSrcBone.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@
99
namespace ofxAssimp {
1010
class SrcBone : public ofxAssimp::SrcNode {
1111
public:
12-
virtual NodeType getType() override { return OFX_ASSIMP_BONE; }
12+
NodeType getType() override { return OFX_ASSIMP_BONE; }
1313

1414
void setAiBone(aiBone* aAiBone, aiNode* aAiNode);
1515
// void update();
1616

1717
std::shared_ptr<ofxAssimp::SrcBone> getBone( aiNode* aAiNode );
1818
void findBoneRecursive( aiNode* aAiNode, std::shared_ptr<SrcBone>& returnBone );
1919

20-
std::string getAsString( unsigned int aLevel=0 );
20+
std::string getAsString( unsigned int aLevel=0 ) override;
2121

2222
unsigned int getNumBones();
2323

‎addons/ofxAssimp/src/Source/ofxAssimpSrcMesh.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ void SrcMesh::setupVbo( std::shared_ptr<ofVbo> avbo ) {
150150
}
151151
}
152152

153-
avbo->setIndexData(&tempIndices[0],tempIndices.size(),GL_STATIC_DRAW);
153+
avbo->setIndexData(&tempIndices[0], (int)tempIndices.size(),GL_STATIC_DRAW);
154154
}
155155

156156
//-------------------------------------------

‎addons/ofxAssimp/src/Source/ofxAssimpSrcMesh.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ namespace ofxAssimp {
1515
class SrcMesh : public ofxAssimp::SrcNode {
1616
public:
1717
static ofTexture sDummyTex;
18-
virtual NodeType getType() override { return OFX_ASSIMP_MESH; }
18+
NodeType getType() override { return OFX_ASSIMP_MESH; }
1919

2020
void addTexture(std::shared_ptr<ofxAssimp::Texture> aAssimpTex);
2121
bool hasTexture();

‎addons/ofxAssimp/src/Source/ofxAssimpSrcNode.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ void SrcNode::addChild( std::shared_ptr<SrcNode> akiddo ) {
104104

105105
//----------------------------------------
106106
unsigned int SrcNode::getNumChildren() {
107-
return mKids.size();
107+
return (unsigned int)mKids.size();
108108
}
109109

110110
//----------------------------------------
@@ -113,7 +113,7 @@ std::vector< std::shared_ptr<SrcNode> >& SrcNode::getChildren() {
113113
}
114114

115115
//--------------------------------------------------------------
116-
std::string SrcNode::getAsString( int aLevel ) {
116+
std::string SrcNode::getAsString( unsigned int aLevel ) {
117117
std::stringstream oStr;// = "";
118118
for( unsigned int i = 0; i < aLevel; i++ ) {
119119
oStr << " ";

‎addons/ofxAssimp/src/Source/ofxAssimpSrcNode.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class SrcNode {
4242
unsigned int getNumChildren();
4343
std::vector< std::shared_ptr<ofxAssimp::SrcNode> >& getChildren();
4444

45-
virtual std::string getAsString( int aLevel=0 );
45+
virtual std::string getAsString( unsigned int aLevel=0 );
4646

4747
// animation functions
4848
ofxAssimp::SrcAnimKeyCollection& getKeyCollection( unsigned int aAnimUId );

‎addons/ofxAssimp/src/Source/ofxAssimpSrcScene.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -821,7 +821,7 @@ void SrcScene::loadGLResources(std::shared_ptr<ofxAssimp::SrcMesh> aSrcMesh, aiM
821821
aSrcMesh->indices[j++] = amesh->mFaces[x].mIndices[a];
822822
}
823823
}
824-
aSrcMesh->vbo->setIndexData(&aSrcMesh->indices[0],aSrcMesh->indices.size(),GL_STATIC_DRAW);
824+
aSrcMesh->vbo->setIndexData(&aSrcMesh->indices[0],(int)aSrcMesh->indices.size(),GL_STATIC_DRAW);
825825
}
826826
ofLogVerbose("ofxAssimp::SrcScene") << "loadGLResource(): finished";
827827
}

‎addons/ofxAssimp/src/ofxAssimpNode.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ void Node::addChild( std::shared_ptr<Node> akiddo ) {
168168

169169
//----------------------------------------
170170
int Node::getNumChildren() {
171-
return mKids.size();
171+
return (int)mKids.size();
172172
}
173173

174174
//----------------------------------------

‎addons/ofxAssimp/src/ofxAssimpScene.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -479,7 +479,7 @@ bool Scene::hasAnimations() {
479479
}
480480

481481
unsigned int Scene::getNumAnimations(){
482-
return mAnimations.size();
482+
return (unsigned int) mAnimations.size();
483483
}
484484

485485
unsigned int Scene::getCurrentAnimationIndex() {
@@ -879,7 +879,7 @@ void Scene::_drawMesh( const shared_ptr<ofxAssimp::Mesh>& amesh, ofPolyRenderMod
879879
ofEnableBlendMode(amesh->blendMode);
880880

881881
#ifndef TARGET_OPENGLES
882-
amesh->vbo->drawElements(GL_TRIANGLES,amesh->getNumIndices());
882+
amesh->vbo->drawElements(GL_TRIANGLES,(int)amesh->getNumIndices());
883883
#else
884884
switch(aRenderType){
885885
case OF_MESH_FILL:

‎examples/3d/3DPrimitivesExample/src/ofApp.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ void ofApp::draw() {
178178
box.transformGL();
179179
for (int i = 0; i < ofBoxPrimitive::SIDES_TOTAL; i++) {
180180
ofPushMatrix();
181-
ofTranslate(boxSides[i].getNormal(0) * sin(ofGetElapsedTimef()) * 50);
181+
ofTranslate(boxSides[i].getNormal(0) * sin(ofGetElapsedTimef()) * 50.0f);
182182
boxSides[i].draw();
183183
ofPopMatrix();
184184
}
@@ -294,13 +294,13 @@ void ofApp::draw() {
294294
cylinder.transformGL();
295295
ofPushMatrix(); {
296296
if (topCap.getNumNormals() > 0) {
297-
ofTranslate(topCap.getNormal(0) * (cos(ofGetElapsedTimef() * 5) + 1)*.5f * 100);
297+
ofTranslate(topCap.getNormal(0) * (cos(ofGetElapsedTimef() * 5) + 1)*.5f * 100.0f);
298298
topCap.draw();
299299
}
300300
} ofPopMatrix();
301301
ofPushMatrix(); {
302302
if (bottomCap.getNumNormals() > 0) {
303-
ofTranslate(bottomCap.getNormal(0) * (cos(ofGetElapsedTimef() * 4) + 1)*.5f * 100);
303+
ofTranslate(bottomCap.getNormal(0) * (cos(ofGetElapsedTimef() * 4) + 1)*.5f * 100.0f);
304304
bottomCap.draw();
305305
}
306306
} ofPopMatrix();
@@ -341,7 +341,7 @@ void ofApp::draw() {
341341
cone.transformGL();
342342
ofPushMatrix();
343343
if (bottomCap.getNumNormals() > 0) {
344-
ofTranslate(bottomCap.getNormal(0) * cone.getHeight()*.5);
344+
ofTranslate(bottomCap.getNormal(0) * (float)cone.getHeight()*.5f);
345345
ofRotateDeg( glm::degrees( sin(ofGetElapsedTimef() * 5) ), 1, 0, 0);
346346
bottomCap.draw();
347347
}

‎examples/3d/normalsExample/src/ofApp.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ void ofApp::setup(){
2222

2323
//loop around and make verts in a circle, with a bit of a z-wave
2424
for (int i = 0; i < max; i++){
25-
float step = 2*PI/max; // step size around circle
26-
float theta = ofMap(i, 0, max-1, 0, 2*PI - step); //map i as circle divisions to actual radian values around the circle (note we don't go quite all the way around by one step, because it will be the same as where we started, so we'll just index that starting vertex when we make faces)
25+
float step = glm::two_pi<float>()/max; // step size around circle
26+
float theta = ofMap(i, 0, max-1, 0, glm::two_pi<float>() - step); //map i as circle divisions to actual radian values around the circle (note we don't go quite all the way around by one step, because it will be the same as where we started, so we'll just index that starting vertex when we make faces)
2727

2828
float prevTheta = theta - step; //one step back
2929
float nextTheta = theta + step; // one step forward
@@ -52,7 +52,7 @@ void ofApp::setup(){
5252

5353
//add a color too
5454
ofColor c;
55-
c.setHsb(40 + 30*sin(2*theta+PI),255,255,255);
55+
c.setHsb(40 + 30*sin(2*theta+glm::pi<float>()),255,255,255);
5656
mesh.addColor(c);
5757
}
5858

‎examples/3d/ofxAssimpExample/src/ofApp.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ void ofApp::draw(){
175175
// // Shadows have the following gl culling enabled by default
176176
// // this helps reduce z fighting by only rendering the rear facing triangles to the depth map
177177
// // the culling can be disabled by calling
178-
// light.getShadow().setGlCullingEnabled(false);
178+
// light.getShadow().setCullingEnabled(false);
179179
// // or the culling winding order can be changed by calling
180180
// light.getShadow().setFrontFaceWindingOrder(GL_CCW); // default is GL_CW
181181
renderScene();

‎examples/android/androidCompositeExample/ofApp/src/main/cpp/ofApp.cpp

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,10 @@ void ofApp::setup(){
5858
volume = 0.1f;
5959
bNoise = false;
6060
initialBufferSize = 256;
61-
61+
6262
lAudio = new float[initialBufferSize];
6363
rAudio = new float[initialBufferSize];
64-
64+
6565
memset(lAudio, 0, initialBufferSize * sizeof(float));
6666
memset(rAudio, 0, initialBufferSize * sizeof(float));
6767

@@ -95,7 +95,7 @@ void ofApp::draw(){
9595
int b = 128 + 50 * sinf(ofGetElapsedTimef());
9696

9797
ofBackground(r,g,b);
98-
98+
9999
if( doShader ){
100100
shader.begin();
101101
//we want to pass in some varrying values to animate our type / color
@@ -122,7 +122,7 @@ void ofApp::draw(){
122122
ofVertex(20+i*10,ofGetHeight() / 2 + 250 + rAudio[i]*500.0f);
123123
}
124124
ofEndShape(false);
125-
125+
126126
//finally draw our text
127127
text.draw();
128128

@@ -133,13 +133,13 @@ void ofApp::draw(){
133133
}
134134

135135
//--------------------------------------------------------------
136-
void ofApp::keyPressed (int key){
137-
136+
void ofApp::keyPressed (int key){
137+
138138
}
139139

140140
//--------------------------------------------------------------
141-
void ofApp::keyReleased(int key){
142-
141+
void ofApp::keyReleased(int key){
142+
143143
}
144144

145145
//--------------------------------------------------------------
@@ -182,7 +182,7 @@ void ofApp::touchMoved(int x, int y, int id){
182182
float height = (float)ofGetHeight();
183183
float heightPct = ((height-y) / height);
184184
targetFrequency = 2000.0f * heightPct;
185-
phaseAdderTarget = (targetFrequency / (float) sampleRate) * TWO_PI;
185+
phaseAdderTarget = (targetFrequency / (float) sampleRate) * glm::two_pi<float>();
186186
}
187187

188188
//--------------------------------------------------------------
@@ -248,8 +248,8 @@ void ofApp::audioOut(ofSoundBuffer & buffer){
248248

249249
// sin (n) seems to have trouble when n is very large, so we
250250
// keep phase in the range of 0-TWO_PI like this:
251-
while (phase > TWO_PI){
252-
phase -= TWO_PI;
251+
while (phase > glm::two_pi<float>()){
252+
phase -= glm::two_pi<float>();
253253
}
254254

255255
if ( bNoise == true){

0 commit comments

Comments
 (0)