Syncing master and android_linux branches #1506
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Now-default alpha blending broke the velocity buffer rendering. Simply disabled the alpha blending.
Fixing OS X sleep-prevention code to address cinder#1323
Fix velocity buffer motion blur sample.
include sdkddkver.h in Cinder.h
…pported detect CMYK files and throw more detailed exception on MSW.
added some popular glsl methods to the using explicit list
VertBatch cleanup
Revert "VertBatch cleanup"
Osc and Tuio updates
Fixed gl::Sync Position in Flickr Multi-threaded Sample
…h_cleanup Thyrrestrup vert batch cleanup
… don't allow duplicate connections
Fixing vc2013 handling of std::atomic
Add vec2 overload of RectT::scaledCentered()
Now mWritePos gets updated in process() through std::atomic::compare_exchange_strong(). The update only happens if mWritePos didn't change since the beginning of process(). if it did change, then it means mWritePos has been reset to 0 by another thread calling start() and therefore it must not be updated ( by adding numWriteFrames to it ) or the new recording will start with an offset of numWriteFrames from the beginning of the buffer.
Build fix: Fixed file names in include
Handle writing zero frames to an audio::TargetFile
…device Handle no available audio device in a recoverable manner.
…infm-fix_buffer_recorder_process_write
...where scanning from the right side was off by 1 pixel.
Fixed an issue with Trim::findNonTransparentArea...
"directive" vice "derictive"
Fix typo in comment
Possible fix for issue cinder#1454.
…o notlion-large-surface
…estedWidth' as an int32_t
Change 'consise' to 'concise'
Typo correction in contributing.md
it should respect the DDPF_FOURCC bit in the pixel format flags (often absent in uncompressed dds files) and handle the case when fourcc is not used.
Fixed an issue with uncompressed dds texture
Resolved conflicts: include/cinder/Cinder.h include/cinder/audio/msw/ContextWasapi.h include/cinder/audio/msw/DeviceManagerWasapi.h vc2015_winrt/cinder.vcxproj
|
There seems to be a minor issue that is breaking the UWP / Angle build due to this PR, however the conflict resolution looks correct in this PR so I'm going to merge it. |
…e preprocessor macro.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There were a few conflicts in MSW files so that platform still needs to be tested, especially UWP.