Skip to content

Commit

Permalink
Merge branch 'master' of github.com:openframeworks/openFrameworks
Browse files Browse the repository at this point in the history
  • Loading branch information
ofTheo committed Aug 30, 2023
2 parents 0bf29b6 + 83b5fd0 commit 984568f
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 7 deletions.
14 changes: 14 additions & 0 deletions CHANGELOG.md
Expand Up @@ -18,6 +18,20 @@
### All 0.12.0 changes newest to oldest ###
Grabbed via: `git log --oneline --ancestry-path ac69b2f..34e8eac --pretty=format:'- %s [commit](https://github.com/openframeworks/openFrameworks/commit/%H)' > changes.txt`

Major Changes:
- all: Physical Based Rendering (PBR) now supported in ofxAssimpModelLoader and ofMaterial
- all: Built in shadow support
- all: C++17 default
- arm: aarch64 / 64bit support for Rapsberry Pi and other arm64 devices
- Windows: ofMediaFoundationSoundPlayer can be used instead of fmod
- macOS: ofAVEngineSoundPlayer can be used instead of fmod
- Windows ofMediaFoundationPlayer for video playback. No need for codecs!!!
- iOS: ARC is now enabled for all projects by default. Some addons might require -fno-objc-arc for files which aren't ARC compatible. [More info](https://stackoverflow.com/a/6658549)
- emscripten: Loads of emscripten fixes to make more examples compatible.
- all: new computer_vision / OpenCV examples
- msys2: UCRT64 support

Full list:
- Update manual-nightly.yml [commit](https://github.com/openframeworks/openFrameworks/commit/42b6dff3e77aa49425dffc2902d32ca86c818a59)
- update submodules [commit](https://github.com/openframeworks/openFrameworks/commit/93d0efda1413471e6f50761f73b1e72f04f6ba42)
- removal of some iOS examples (#7601) [commit](https://github.com/openframeworks/openFrameworks/commit/478620f212ec09b48abfd99e8e285c09b97ca921)
Expand Down
2 changes: 0 additions & 2 deletions examples/3d/advanced3dExample/src/Swarm.cpp
Expand Up @@ -17,8 +17,6 @@ void swarm::init(int nParticles, float positionDispersion, float velocityDispers
particles.clear();
}

ofSeedRandom();
//
glm::vec3 position, velocity;
ofColor color;
for(int i = 0; i < nParticles; i++){
Expand Down
2 changes: 0 additions & 2 deletions examples/android/androidAdvanced3DExample/src/Swarm.cpp
Expand Up @@ -56,8 +56,6 @@ void Swarm::init(int _nParticles, float positionDispersion, float velocityDisper
// INITIALISE VALUES
///////////////////////////////////////////
//
ofSeedRandom();
//
for (int i=0; i< nParticles; i++)
{
positions[i].x = (ofRandom(1.0f)-0.5f) * positionDispersion;
Expand Down
2 changes: 1 addition & 1 deletion examples/gl/billboardRotationExample/src/ofApp.cpp
Expand Up @@ -52,7 +52,7 @@ void ofApp::update() {


for (int i=0; i<NUM_BILLBOARDS; i++) {
ofSeedRandom(i);
ofSetRandomSeed(i);
if(glm::distance(mouse,pos[i]) < ofRandom(100, 200)) {
vel[i] -= mouseVec;
}
Expand Down
2 changes: 1 addition & 1 deletion examples/math/randomExample/src/ofApp.h
Expand Up @@ -18,7 +18,7 @@ class ofApp : public ofBaseApp{
auto perform_shuffle() {
std::vector<uint8_t> values = { 1, 2, 3, 4, 5, 6, 7, 8 }; // initial order
ofShuffle(values);
  shuffled_string_ = "shuffled values:";
shuffled_string_ = "shuffled values:";
for (const auto v: values) {
shuffled_string_ += " " + ofToUpper(ofToHex(v));
}
Expand Down
1 change: 0 additions & 1 deletion tests/addons/networkTcp/src/main.cpp
Expand Up @@ -257,7 +257,6 @@ class ofApp: public ofxUnitTestsApp{
}

void run(){
ofSeedRandom(ofGetSeconds());
testNonBlocking();
testBlocking();
disconnectionAutoDetection();
Expand Down

0 comments on commit 984568f

Please sign in to comment.