forked from openframeworks/openFrameworks
-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into Feature-VS2013
* master: (329 commits) ofThread, change order of flags and detach to avoid potential problems ofThread: detach thread on stop if it's not being waited. Closes openframeworks#2506 ofParameterGroup: fix nested parameter groups and memory leak, switch ofPtr to shared_ptr. Closes openframeworks#2674 assimp: use shared_ptr for scene assimp: fix to allow to put loaders on vectors and in general fix copy glfw: linux armv7 library with keys fix fix setupPerspective & setupOrtho not using passed width & height, set defaults to -1 glfw: linux32 lib with key fixes glfw vs library with keys fix glfw: windows library with key fixes ofThread: change infinite wait time to -1 osx glfw lib with patch for keys on non-english keyboards Update ofAppGLFWWindow.cpp added example of sending an image over ofxOsc with the blob data type. had to increase the send and receive buffer sizes to make it work. updated glfw to latest master + patch to fix keys, only tested on linux ofAppNoWindow: fix some function signatures blob support for ofxOsc. Blobs can be added and received as ofBuffers allowing binary data to be sent. oscpack has blob support so this is just making ofxOsc more complete. Updated the ReadMe to reflect the 1.0.12 libusb requirement for linux. Bugfix with ofxKinect fixes bug where Kinect will not re-open if app crashes without shutting Kinect down. Requires latest libusb Closes openframeworks#2968 linux: more precise timming function through monotonic clock ... Conflicts: libs/openFrameworksCompiled/project/vs/openframeworksLib.vcxproj
- Loading branch information
Showing
305 changed files
with
12,959 additions
and
2,974 deletions.
There are no files selected for viewing
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,24 +1,67 @@ | ||
| [openFrameworks](http://openframeworks.cc/) | ||
| ================ | ||
| openFrameworks is a C++ toolkit for creative coding | ||
|
|
||
| Download | ||
| openFrameworks is a C++ toolkit for creative coding. If you are new to OF, welcome! | ||
|
|
||
|
|
||
| folder structure | ||
| -------- | ||
|
|
||
| This release of OF comes with several folders: | ||
|
|
||
| * addons | ||
| * apps | ||
| * docs | ||
| * examples | ||
| * export (on some systems) | ||
| * libs | ||
| * other | ||
| * scripts | ||
| * project generator | ||
|
|
||
|
|
||
| `docs` has some documentation around OF usage, per platform things to consider, etc. You should definitely take a look in there, for example, if you are on OSX, read the osx.md. `apps` and `examples` are where projects go -- `examples` contains a variety of projects that show you how to use OF, and `apps` is where your own projects will go. `libs` contains the libraries that OF uses, including the openframeworks core itself. `addons` are for additional functionality that's not part of the core. `export` is for DLLs and dylibs that need to be put in each compiled project. The `scripts` folder has the templates and small scripts for automating OF per platform. `project generator` is a GUI based tool for making new projects - this folder is only there in packaged releases. | ||
|
|
||
| One idea that's important is that OF releases are designed to be self-contained. You can put them anywhere on your hard drive, but it's not possible to mix different releases of OF together, so please keep each release (0.8.0, 0.8.1) separate. Projects may generally work from release to release, but this is not guaranteed. Because OF is self-contained, there's extensive use of local file paths (ie, ../../../) thoughout OF. It's important to be aware of how directories are structured. A common error is to take a project and move it so that it's a level below or above where it used to be compared to the root of OF. This means that links such as ../../../libs will break. | ||
|
|
||
|
|
||
| Get involved | ||
| -------- | ||
|
|
||
| The openframeworks forum: | ||
|
|
||
| [http://forum.openframeworks.cc/]() | ||
|
|
||
| is a warm and friendly place Please ask or answer a question. The most important part of this project is that it's a community, more than just a tool, so please join us! Also, this is free software, and we learn so much about what is hard, what doesn't make sense, what is useful, etc. The most basic questions are acceptable here! Don't worry, just join the conversation. Learning in OF is social, it's hard to do it alone, but together we can get far! | ||
|
|
||
| Our github site is active: | ||
|
|
||
| [https://github.com/openframeworks/openFrameworks]() | ||
|
|
||
| if you have bugs or feature requests, consider opening an issue. If you are a developer and want to help, pull requests are warmly welcome. Please read the contributing guide for guidelines: | ||
|
|
||
| https://github.com/openframeworks/openFrameworks/blob/master/CONTRIBUTING.md | ||
|
|
||
| We also have a developer's mailing list, which is useful for discussing issues around the development and future of OF. | ||
|
|
||
|
|
||
| Developers | ||
| ------ | ||
|
|
||
| To grab a copy of openFrameworks for your platform, check the [download page](http://openframeworks.cc/download) on the main site. | ||
|
|
||
| The `master` branch of this repository corresponds to the most recent release, with a few differences: | ||
| If you are working with the Git repository, the `stable` branch of the OF repository corresponds to the most recent release, with a few important differences: | ||
|
|
||
| 1. The release includes a simple openFrameworks project generator. | ||
| 2. This GitHub repository contains code and libs for all the platforms, but the releases are done on a per-platform basis. | ||
| 3. This GitHub repository has no project files for the different examples. They are generated automatically for each release using a tool in `apps/devApps/projectGenerator/`. | ||
|
|
||
| How to | ||
| ------ | ||
| If you want to work with the openFrameworks GitHub repository, you should use the project generator to create project files for all the code in `examples/`. | ||
| For per-platform readmes, and more informations, see [documentation](docs/table_of_contents.md). | ||
| For per-platform readmes, and more informations, see the [documentation](docs/table_of_contents.md). | ||
|
|
||
| To set up the project generator submodule, use the command `git submodule init` then `git submodule update` whilst inside the openFrameworks repo. | ||
|
|
||
| Versioning | ||
| ---------- | ||
| openFrameworks uses [Semantic Versioning](http://semver.org/), although strict adherence will only come into effect at version 1.0.0. | ||
|
|
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| <?xml version="1.0" encoding="UTF-8" standalone="no"?> | ||
| <?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage"> | ||
| <storageModule moduleId="org.eclipse.cdt.core.settings"> | ||
| <cconfiguration id="cdt.managedbuild.toolchain.gnu.base.1400488734"> | ||
| <storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.toolchain.gnu.base.1400488734" moduleId="org.eclipse.cdt.core.settings" name="Default"> | ||
| <externalSettings/> | ||
| <extensions> | ||
| <extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/> | ||
| <extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/> | ||
| <extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/> | ||
| <extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/> | ||
| <extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/> | ||
| <extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/> | ||
| </extensions> | ||
| </storageModule> | ||
| <storageModule moduleId="cdtBuildSystem" version="4.0.0"> | ||
| <configuration buildProperties="" id="cdt.managedbuild.toolchain.gnu.base.1400488734" name="Default" parent="org.eclipse.cdt.build.core.emptycfg"> | ||
| <folderInfo id="cdt.managedbuild.toolchain.gnu.base.1400488734.902306010" name="/" resourcePath=""> | ||
| <toolChain id="cdt.managedbuild.toolchain.gnu.base.1481541294" name="cdt.managedbuild.toolchain.gnu.base" superClass="cdt.managedbuild.toolchain.gnu.base"> | ||
| <targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="cdt.managedbuild.target.gnu.platform.base.839125540" name="Debug Platform" osList="linux,hpux,aix,qnx" superClass="cdt.managedbuild.target.gnu.platform.base"/> | ||
| <builder id="cdt.managedbuild.target.gnu.builder.base.704838190" managedBuildOn="false" name="Gnu Make Builder.Default" superClass="cdt.managedbuild.target.gnu.builder.base"/> | ||
| <tool id="cdt.managedbuild.tool.gnu.archiver.base.1839791504" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base"/> | ||
| <tool id="cdt.managedbuild.tool.gnu.cpp.compiler.base.1452912068" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.base"/> | ||
| <tool id="cdt.managedbuild.tool.gnu.c.compiler.base.1238610489" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.base"/> | ||
| <tool id="cdt.managedbuild.tool.gnu.c.linker.base.539273223" name="GCC C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.base"/> | ||
| <tool id="cdt.managedbuild.tool.gnu.cpp.linker.base.1745096672" name="GCC C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.base"/> | ||
| <tool id="cdt.managedbuild.tool.gnu.assembler.base.703984486" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.base"/> | ||
| </toolChain> | ||
| </folderInfo> | ||
| </configuration> | ||
| </storageModule> | ||
| <storageModule moduleId="org.eclipse.cdt.core.externalSettings"/> | ||
| </cconfiguration> | ||
| </storageModule> | ||
| <storageModule moduleId="cdtBuildSystem" version="4.0.0"> | ||
| <project id="addons.null.1300033385" name="addons"/> | ||
| </storageModule> | ||
| <storageModule moduleId="scannerConfiguration"> | ||
| <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/> | ||
| </storageModule> | ||
| <storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/> | ||
| </cproject> |
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
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
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
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
Oops, something went wrong.