diff --git a/blocks/__AppTemplates/BasicApp/OpenGL/assets/_TBOX_IGNORE_ b/blocks/__AppTemplates/BasicApp/OpenGL/assets/_TBOX_IGNORE_ deleted file mode 100644 index b5957919d7..0000000000 --- a/blocks/__AppTemplates/BasicApp/OpenGL/assets/_TBOX_IGNORE_ +++ /dev/null @@ -1 +0,0 @@ -This file is here to prevent git from removing the directory. \ No newline at end of file diff --git a/blocks/__AppTemplates/BasicApp/OpenGL/include/Resources.h b/blocks/__AppTemplates/BasicApp/OpenGL/include/Resources.h deleted file mode 100644 index bada583f30..0000000000 --- a/blocks/__AppTemplates/BasicApp/OpenGL/include/Resources.h +++ /dev/null @@ -1,5 +0,0 @@ -#pragma once -#include "cinder/CinderResources.h" - -//#define RES_MY_RES CINDER_RESOURCE( ../resources/, image_name.png, 128, IMAGE ) - diff --git a/blocks/__AppTemplates/BasicApp/OpenGL/resources/CinderApp.icns b/blocks/__AppTemplates/BasicApp/OpenGL/resources/CinderApp.icns deleted file mode 100644 index e3f05c8962..0000000000 Binary files a/blocks/__AppTemplates/BasicApp/OpenGL/resources/CinderApp.icns and /dev/null differ diff --git a/blocks/__AppTemplates/BasicApp/OpenGL/resources/CinderApp_ios.png b/blocks/__AppTemplates/BasicApp/OpenGL/resources/CinderApp_ios.png deleted file mode 100644 index 1611801aa2..0000000000 Binary files a/blocks/__AppTemplates/BasicApp/OpenGL/resources/CinderApp_ios.png and /dev/null differ diff --git a/blocks/__AppTemplates/BasicApp/OpenGL/resources/cinder_app_icon.ico b/blocks/__AppTemplates/BasicApp/OpenGL/resources/cinder_app_icon.ico deleted file mode 100644 index b35fb854d8..0000000000 Binary files a/blocks/__AppTemplates/BasicApp/OpenGL/resources/cinder_app_icon.ico and /dev/null differ diff --git a/blocks/__AppTemplates/BasicApp/OpenGL/src/_TBOX_PREFIX_App.cpp b/blocks/__AppTemplates/BasicApp/OpenGL/src/_TBOX_PREFIX_App.cpp deleted file mode 100644 index a5e15fb743..0000000000 --- a/blocks/__AppTemplates/BasicApp/OpenGL/src/_TBOX_PREFIX_App.cpp +++ /dev/null @@ -1,34 +0,0 @@ -#include "cinder/app/App.h" -#include "cinder/app/RendererGl.h" -#include "cinder/gl/gl.h" - -using namespace ci; -using namespace ci::app; -using namespace std; - -class _TBOX_PREFIX_App : public App { - public: - void setup() override; - void mouseDown( MouseEvent event ) override; - void update() override; - void draw() override; -}; - -void _TBOX_PREFIX_App::setup() -{ -} - -void _TBOX_PREFIX_App::mouseDown( MouseEvent event ) -{ -} - -void _TBOX_PREFIX_App::update() -{ -} - -void _TBOX_PREFIX_App::draw() -{ - gl::clear( Color( 0, 0, 0 ) ); -} - -CINDER_APP( _TBOX_PREFIX_App, RendererGl ) diff --git a/blocks/__AppTemplates/BasicApp/OpenGL/template.xml b/blocks/__AppTemplates/BasicApp/OpenGL/template.xml deleted file mode 100644 index 1e4fdf9f6d..0000000000 --- a/blocks/__AppTemplates/BasicApp/OpenGL/template.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - \ No newline at end of file diff --git a/blocks/__AppTemplates/BasicApp/OpenGL/vc2015_uwp/Package.appxmanifest b/blocks/__AppTemplates/BasicApp/OpenGL/vc2015_uwp/Package.appxmanifest deleted file mode 100644 index b26097bd7c..0000000000 --- a/blocks/__AppTemplates/BasicApp/OpenGL/vc2015_uwp/Package.appxmanifest +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - _TBOX_PREFIX_ - cinderuser - VisualAssets\StoreLogo.png - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/blocks/__AppTemplates/BasicApp/OpenGL/vc2015_uwp/VisualAssets/Logo.png b/blocks/__AppTemplates/BasicApp/OpenGL/vc2015_uwp/VisualAssets/Logo.png deleted file mode 100644 index b3e3c4d8e5..0000000000 Binary files a/blocks/__AppTemplates/BasicApp/OpenGL/vc2015_uwp/VisualAssets/Logo.png and /dev/null differ diff --git a/blocks/__AppTemplates/BasicApp/OpenGL/vc2015_uwp/VisualAssets/SmallLogo.png b/blocks/__AppTemplates/BasicApp/OpenGL/vc2015_uwp/VisualAssets/SmallLogo.png deleted file mode 100644 index 7d701d1cf2..0000000000 Binary files a/blocks/__AppTemplates/BasicApp/OpenGL/vc2015_uwp/VisualAssets/SmallLogo.png and /dev/null differ diff --git a/blocks/__AppTemplates/BasicApp/OpenGL/vc2015_uwp/VisualAssets/SplashScreen.png b/blocks/__AppTemplates/BasicApp/OpenGL/vc2015_uwp/VisualAssets/SplashScreen.png deleted file mode 100644 index 05f3e0557f..0000000000 Binary files a/blocks/__AppTemplates/BasicApp/OpenGL/vc2015_uwp/VisualAssets/SplashScreen.png and /dev/null differ diff --git a/blocks/__AppTemplates/BasicApp/OpenGL/vc2015_uwp/VisualAssets/StoreLogo.png b/blocks/__AppTemplates/BasicApp/OpenGL/vc2015_uwp/VisualAssets/StoreLogo.png deleted file mode 100644 index c8c9c4d5e4..0000000000 Binary files a/blocks/__AppTemplates/BasicApp/OpenGL/vc2015_uwp/VisualAssets/StoreLogo.png and /dev/null differ diff --git a/blocks/__AppTemplates/BasicApp/OpenGL/xcode/Info.plist b/blocks/__AppTemplates/BasicApp/OpenGL/xcode/Info.plist deleted file mode 100644 index 838dc0d6b5..0000000000 --- a/blocks/__AppTemplates/BasicApp/OpenGL/xcode/Info.plist +++ /dev/null @@ -1,34 +0,0 @@ - - - - - CFBundleDevelopmentRegion - en - CFBundleExecutable - ${EXECUTABLE_NAME} - CFBundleIconFile - CinderApp.icns - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - ${PRODUCT_NAME} - CFBundlePackageType - APPL - CFBundleShortVersionString - 1.0 - CFBundleSignature - ???? - CFBundleVersion - 1 - LSMinimumSystemVersion - ${MACOSX_DEPLOYMENT_TARGET} - NSHumanReadableCopyright - Copyright © 2015 __MyCompanyName__. All rights reserved. - NSMainNibFile - MainMenu - NSPrincipalClass - NSApplication - - diff --git a/blocks/__AppTemplates/BasicApp/OpenGL/xcode/_TBOX_PREFIX__Prefix.pch b/blocks/__AppTemplates/BasicApp/OpenGL/xcode/_TBOX_PREFIX__Prefix.pch deleted file mode 100644 index 226b4a63fc..0000000000 --- a/blocks/__AppTemplates/BasicApp/OpenGL/xcode/_TBOX_PREFIX__Prefix.pch +++ /dev/null @@ -1,12 +0,0 @@ -#if defined( __cplusplus ) - #include "cinder/Cinder.h" - - #include "cinder/app/App.h" - - #include "cinder/gl/gl.h" - - #include "cinder/CinderMath.h" - #include "cinder/Matrix.h" - #include "cinder/Vector.h" - #include "cinder/Quaternion.h" -#endif diff --git a/blocks/__AppTemplates/BasicApp/OpenGL/xcode_ios/Images.xcassets/LaunchImage.launchimage/Contents.json b/blocks/__AppTemplates/BasicApp/OpenGL/xcode_ios/Images.xcassets/LaunchImage.launchimage/Contents.json deleted file mode 100644 index acfca0141a..0000000000 --- a/blocks/__AppTemplates/BasicApp/OpenGL/xcode_ios/Images.xcassets/LaunchImage.launchimage/Contents.json +++ /dev/null @@ -1,110 +0,0 @@ -{ - "images" : [ - { - "orientation" : "portrait", - "idiom" : "iphone", - "extent" : "full-screen", - "minimum-system-version" : "8.0", - "subtype" : "736h", - "filename" : "Default-736h@3x~iphone.png", - "scale" : "3x" - }, - { - "orientation" : "landscape", - "idiom" : "iphone", - "extent" : "full-screen", - "minimum-system-version" : "8.0", - "subtype" : "736h", - "scale" : "3x" - }, - { - "extent" : "full-screen", - "idiom" : "iphone", - "subtype" : "667h", - "filename" : "Default-667@2x.png", - "minimum-system-version" : "8.0", - "orientation" : "portrait", - "scale" : "2x" - }, - { - "orientation" : "portrait", - "idiom" : "iphone", - "extent" : "full-screen", - "minimum-system-version" : "7.0", - "scale" : "2x" - }, - { - "extent" : "full-screen", - "idiom" : "iphone", - "subtype" : "retina4", - "filename" : "Default-568h@2x.png", - "minimum-system-version" : "7.0", - "orientation" : "portrait", - "scale" : "2x" - }, - { - "orientation" : "portrait", - "idiom" : "ipad", - "extent" : "full-screen", - "minimum-system-version" : "7.0", - "scale" : "1x" - }, - { - "orientation" : "landscape", - "idiom" : "ipad", - "extent" : "full-screen", - "minimum-system-version" : "7.0", - "scale" : "1x" - }, - { - "orientation" : "portrait", - "idiom" : "ipad", - "extent" : "full-screen", - "minimum-system-version" : "7.0", - "scale" : "2x" - }, - { - "orientation" : "landscape", - "idiom" : "ipad", - "extent" : "full-screen", - "minimum-system-version" : "7.0", - "scale" : "2x" - }, - { - "orientation" : "portrait", - "idiom" : "iphone", - "extent" : "full-screen", - "scale" : "1x" - }, - { - "orientation" : "portrait", - "idiom" : "iphone", - "extent" : "full-screen", - "scale" : "2x" - }, - { - "orientation" : "portrait", - "idiom" : "iphone", - "extent" : "full-screen", - "filename" : "Default-568h@2x.png", - "subtype" : "retina4", - "scale" : "2x" - }, - { - "orientation" : "portrait", - "idiom" : "ipad", - "extent" : "to-status-bar", - "scale" : "1x" - }, - { - "orientation" : "portrait", - "idiom" : "ipad", - "extent" : "to-status-bar", - "scale" : "2x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/blocks/__AppTemplates/BasicApp/OpenGL/xcode_ios/Images.xcassets/LaunchImage.launchimage/Default-568h@2x.png b/blocks/__AppTemplates/BasicApp/OpenGL/xcode_ios/Images.xcassets/LaunchImage.launchimage/Default-568h@2x.png deleted file mode 100644 index 3721366196..0000000000 Binary files a/blocks/__AppTemplates/BasicApp/OpenGL/xcode_ios/Images.xcassets/LaunchImage.launchimage/Default-568h@2x.png and /dev/null differ diff --git a/blocks/__AppTemplates/BasicApp/OpenGL/xcode_ios/Images.xcassets/LaunchImage.launchimage/Default-667@2x.png b/blocks/__AppTemplates/BasicApp/OpenGL/xcode_ios/Images.xcassets/LaunchImage.launchimage/Default-667@2x.png deleted file mode 100644 index 8f2c501608..0000000000 Binary files a/blocks/__AppTemplates/BasicApp/OpenGL/xcode_ios/Images.xcassets/LaunchImage.launchimage/Default-667@2x.png and /dev/null differ diff --git a/blocks/__AppTemplates/BasicApp/OpenGL/xcode_ios/Images.xcassets/LaunchImage.launchimage/Default-736h@3x~iphone.png b/blocks/__AppTemplates/BasicApp/OpenGL/xcode_ios/Images.xcassets/LaunchImage.launchimage/Default-736h@3x~iphone.png deleted file mode 100644 index dcbedba3d4..0000000000 Binary files a/blocks/__AppTemplates/BasicApp/OpenGL/xcode_ios/Images.xcassets/LaunchImage.launchimage/Default-736h@3x~iphone.png and /dev/null differ diff --git a/blocks/__AppTemplates/BasicApp/OpenGL/xcode_ios/Info.plist b/blocks/__AppTemplates/BasicApp/OpenGL/xcode_ios/Info.plist deleted file mode 100644 index 266b8004de..0000000000 --- a/blocks/__AppTemplates/BasicApp/OpenGL/xcode_ios/Info.plist +++ /dev/null @@ -1,57 +0,0 @@ - - - - - CFBundleDevelopmentRegion - en - UILaunchStoryboardName - LaunchScreen.xib - CFBundleDisplayName - ${PRODUCT_NAME} - CFBundleExecutable - ${EXECUTABLE_NAME} - CFBundleIconFile - - CFBundleIcons - - CFBundlePrimaryIcon - - CFBundleIconFiles - - - CinderApp_ios.png - - UIPrerenderedIcon - - - - CFBundleIdentifier - org.libcinder.${PRODUCT_NAME:rfc1034identifier} - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - ${PRODUCT_NAME} - CFBundlePackageType - APPL - CFBundleShortVersionString - 1.0 - CFBundleSignature - ???? - CFBundleVersion - 1 - LSRequiresIPhoneOS - - NSMainNibFile - - NSMainNibFile~ipad - - UISupportedInterfaceOrientations - - UIInterfaceOrientationPortrait - - UISupportedInterfaceOrientations~ipad - - UIInterfaceOrientationPortrait - - - diff --git a/blocks/__AppTemplates/BasicApp/OpenGL/xcode_ios/LaunchScreen.xib b/blocks/__AppTemplates/BasicApp/OpenGL/xcode_ios/LaunchScreen.xib deleted file mode 100644 index e774fe5e2b..0000000000 --- a/blocks/__AppTemplates/BasicApp/OpenGL/xcode_ios/LaunchScreen.xib +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/blocks/__AppTemplates/BasicApp/OpenGL/xcode_ios/_TBOX_PREFIX__Prefix.pch b/blocks/__AppTemplates/BasicApp/OpenGL/xcode_ios/_TBOX_PREFIX__Prefix.pch deleted file mode 100644 index b1177b5d85..0000000000 --- a/blocks/__AppTemplates/BasicApp/OpenGL/xcode_ios/_TBOX_PREFIX__Prefix.pch +++ /dev/null @@ -1,12 +0,0 @@ -#if defined( __cplusplus ) - #include "cinder/Cinder.h" - - #include "cinder/app/App.h" - - #include "cinder/gl/gl.h" - - #include "cinder/CinderMath.h" - #include "cinder/Matrix.h" - #include "cinder/Vector.h" - #include "cinder/Quaternion.h" -#endif \ No newline at end of file diff --git a/blocks/__AppTemplates/CocoaView/OpenGL/assets/_TBOX_IGNORE_ b/blocks/__AppTemplates/CocoaView/OpenGL/assets/_TBOX_IGNORE_ deleted file mode 100644 index b5957919d7..0000000000 --- a/blocks/__AppTemplates/CocoaView/OpenGL/assets/_TBOX_IGNORE_ +++ /dev/null @@ -1 +0,0 @@ -This file is here to prevent git from removing the directory. \ No newline at end of file diff --git a/blocks/__AppTemplates/CocoaView/OpenGL/include/Resources.h b/blocks/__AppTemplates/CocoaView/OpenGL/include/Resources.h deleted file mode 100644 index 8a579985ef..0000000000 --- a/blocks/__AppTemplates/CocoaView/OpenGL/include/Resources.h +++ /dev/null @@ -1,5 +0,0 @@ -#pragma once -#include "cinder/CinderResources.h" -#include "Resources.h" - -//#define RES_MY_RES CINDER_RESOURCE( ../resources/, image_name.png, 128, IMAGE ) diff --git a/blocks/__AppTemplates/CocoaView/OpenGL/include/_TBOX_PREFIX_App.h b/blocks/__AppTemplates/CocoaView/OpenGL/include/_TBOX_PREFIX_App.h deleted file mode 100644 index d4e445a36f..0000000000 --- a/blocks/__AppTemplates/CocoaView/OpenGL/include/_TBOX_PREFIX_App.h +++ /dev/null @@ -1,12 +0,0 @@ -#pragma once - -#include "cinder/app/cocoa/AppCocoaView.h" - -class _TBOX_PREFIX_App : public cinder::app::AppCocoaView { - public: - void setup(); - void draw(); - - float mRadius; - cinder::Colorf mColor; -}; diff --git a/blocks/__AppTemplates/CocoaView/OpenGL/include/_TBOX_PREFIX_Delegate.h b/blocks/__AppTemplates/CocoaView/OpenGL/include/_TBOX_PREFIX_Delegate.h deleted file mode 100644 index 555c448f30..0000000000 --- a/blocks/__AppTemplates/CocoaView/OpenGL/include/_TBOX_PREFIX_Delegate.h +++ /dev/null @@ -1,21 +0,0 @@ - -#include "cinder/app/cocoa/CinderViewMac.h" -#include "_TBOX_PREFIX_App.h" -#include "cinder/app/RendererGl.h" -#import - -@interface _TBOX_PREFIX_Delegate : NSObject -{ - IBOutlet CinderViewMac *cinderView; - IBOutlet NSWindow *window; - IBOutlet NSColorWell *colorWell; - - _TBOX_PREFIX_App *mApp; -} - -@property (assign) IBOutlet NSWindow *window; - -- (IBAction)subdivisionSliderChanged:(id)sender; -- (IBAction)colorChanged:(id)sender; - -@end diff --git a/blocks/__AppTemplates/CocoaView/OpenGL/resources/CinderApp.icns b/blocks/__AppTemplates/CocoaView/OpenGL/resources/CinderApp.icns deleted file mode 100644 index 8ca780d145..0000000000 Binary files a/blocks/__AppTemplates/CocoaView/OpenGL/resources/CinderApp.icns and /dev/null differ diff --git a/blocks/__AppTemplates/CocoaView/OpenGL/src/_TBOX_PREFIX_App.cpp b/blocks/__AppTemplates/CocoaView/OpenGL/src/_TBOX_PREFIX_App.cpp deleted file mode 100644 index a38702033a..0000000000 --- a/blocks/__AppTemplates/CocoaView/OpenGL/src/_TBOX_PREFIX_App.cpp +++ /dev/null @@ -1,19 +0,0 @@ -#include "_TBOX_PREFIX_App.h" -#include "cinder/gl/gl.h" - -using namespace ci; -using namespace ci::app; - -void _TBOX_PREFIX_App::setup() -{ - mRadius = 50; - mColor = Color( 1.0f, 0.5f, 0.25f ); -} - -void _TBOX_PREFIX_App::draw() -{ - gl::clear(); - - gl::color( mColor ); - gl::drawSolidCircle( getWindowCenter(), mRadius ); -} diff --git a/blocks/__AppTemplates/CocoaView/OpenGL/src/_TBOX_PREFIX_Delegate.mm b/blocks/__AppTemplates/CocoaView/OpenGL/src/_TBOX_PREFIX_Delegate.mm deleted file mode 100644 index 145e036003..0000000000 --- a/blocks/__AppTemplates/CocoaView/OpenGL/src/_TBOX_PREFIX_Delegate.mm +++ /dev/null @@ -1,40 +0,0 @@ -#include "cinder/Cinder.h" -#include "cinder/Rand.h" -#import "_TBOX_PREFIX_Delegate.h" - -@implementation _TBOX_PREFIX_Delegate - -@synthesize window; - -- (void)dealloc -{ - [super dealloc]; -} - -- (void)applicationDidFinishLaunching:(NSNotification *)aNotification -{ - cinder::app::AppBase::Settings settings; - cinder::app::RendererRef renderer( new cinder::app::RendererGl ); - _TBOX_PREFIX_App::initialize(&settings, renderer); - - mApp = new _TBOX_PREFIX_App; - mApp->setupCinderView( cinderView ); - mApp->launch(); - - [window setAcceptsMouseMovedEvents:YES]; - - colorWell.color = [NSColor colorWithCalibratedRed:mApp->mColor.r green:mApp->mColor.g blue:mApp->mColor.b alpha:1.0f]; -} - -- (IBAction)subdivisionSliderChanged:(id)sender -{ - mApp->mRadius = [sender intValue]; -} - -- (IBAction)colorChanged:(id)sender -{ - NSColor *color = [sender color]; - mApp->mColor = ci::Colorf( [color redComponent], [color greenComponent], [color blueComponent] ); -} - -@end diff --git a/blocks/__AppTemplates/CocoaView/OpenGL/src/main.m b/blocks/__AppTemplates/CocoaView/OpenGL/src/main.m deleted file mode 100644 index 27f298f575..0000000000 --- a/blocks/__AppTemplates/CocoaView/OpenGL/src/main.m +++ /dev/null @@ -1,6 +0,0 @@ -#import - -int main(int argc, char *argv[]) -{ - return NSApplicationMain(argc, (const char **)argv); -} diff --git a/blocks/__AppTemplates/CocoaView/OpenGL/template.xml b/blocks/__AppTemplates/CocoaView/OpenGL/template.xml deleted file mode 100644 index 5d258859b1..0000000000 --- a/blocks/__AppTemplates/CocoaView/OpenGL/template.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - \ No newline at end of file diff --git a/blocks/__AppTemplates/CocoaView/OpenGL/xcode/Info.plist b/blocks/__AppTemplates/CocoaView/OpenGL/xcode/Info.plist deleted file mode 100644 index 93661c2435..0000000000 --- a/blocks/__AppTemplates/CocoaView/OpenGL/xcode/Info.plist +++ /dev/null @@ -1,34 +0,0 @@ - - - - - CFBundleDevelopmentRegion - en - CFBundleExecutable - ${EXECUTABLE_NAME} - CFBundleIconFile - CinderApp.icns - CFBundleIdentifier - org.libcinder.${PRODUCT_NAME:rfc1034identifier} - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - ${PRODUCT_NAME} - CFBundlePackageType - APPL - CFBundleShortVersionString - 1.0 - CFBundleSignature - ???? - CFBundleVersion - 1 - LSMinimumSystemVersion - ${MACOSX_DEPLOYMENT_TARGET} - NSHumanReadableCopyright - Copyright © 2015 __MyCompanyName__. All rights reserved. - NSMainNibFile - MainMenu - NSPrincipalClass - NSApplication - - diff --git a/blocks/__AppTemplates/CocoaView/OpenGL/xcode/TestApp.xcodeproj/project.pbxproj b/blocks/__AppTemplates/CocoaView/OpenGL/xcode/TestApp.xcodeproj/project.pbxproj deleted file mode 100644 index 16960c0e5b..0000000000 --- a/blocks/__AppTemplates/CocoaView/OpenGL/xcode/TestApp.xcodeproj/project.pbxproj +++ /dev/null @@ -1,277 +0,0 @@ -// !$*UTF8*$! -{ - archiveVersion = 1; - classes = { - }; - objectVersion = 46; - objects = { - -/* Begin PBXBuildFile section */ - 003C0CA615A1F07200FF29F5 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 003C0CA515A1F07200FF29F5 /* Cocoa.framework */; }; - 003C0CD915A33ECF00FF29F5 /* Accelerate.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 003C0CD315A33ECF00FF29F5 /* Accelerate.framework */; }; - 003C0CDA15A33ECF00FF29F5 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 003C0CD415A33ECF00FF29F5 /* AudioToolbox.framework */; }; - 003C0CDB15A33ECF00FF29F5 /* AudioUnit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 003C0CD515A33ECF00FF29F5 /* AudioUnit.framework */; }; - 003C0CDC15A33ECF00FF29F5 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 003C0CD615A33ECF00FF29F5 /* OpenGL.framework */; }; - 003C0CE015A33EDE00FF29F5 /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 003C0CDF15A33EDE00FF29F5 /* CoreVideo.framework */; }; - 003C0CE215A33EEC00FF29F5 /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 003C0CE115A33EEC00FF29F5 /* CoreAudio.framework */; }; - 00ED0B7C15B07FEE0034FE7C /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 00ED0B7915B07FBC0034FE7C /* CoreLocation.framework */; }; -/* End PBXBuildFile section */ - -/* Begin PBXFileReference section */ - 003C0CA115A1F07200FF29F5 /* TestApp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = TestApp.app; sourceTree = BUILT_PRODUCTS_DIR; }; - 003C0CA515A1F07200FF29F5 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; }; - 003C0CA815A1F07200FF29F5 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; }; - 003C0CA915A1F07200FF29F5 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = System/Library/Frameworks/CoreData.framework; sourceTree = SDKROOT; }; - 003C0CAA15A1F07200FF29F5 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; - 003C0CD315A33ECF00FF29F5 /* Accelerate.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Accelerate.framework; path = System/Library/Frameworks/Accelerate.framework; sourceTree = SDKROOT; }; - 003C0CD415A33ECF00FF29F5 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; }; - 003C0CD515A33ECF00FF29F5 /* AudioUnit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioUnit.framework; path = System/Library/Frameworks/AudioUnit.framework; sourceTree = SDKROOT; }; - 003C0CD615A33ECF00FF29F5 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = System/Library/Frameworks/OpenGL.framework; sourceTree = SDKROOT; }; - 003C0CDF15A33EDE00FF29F5 /* CoreVideo.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreVideo.framework; path = System/Library/Frameworks/CoreVideo.framework; sourceTree = SDKROOT; }; - 003C0CE115A33EEC00FF29F5 /* CoreAudio.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudio.framework; path = System/Library/Frameworks/CoreAudio.framework; sourceTree = SDKROOT; }; - 00ED0B7915B07FBC0034FE7C /* CoreLocation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreLocation.framework; path = System/Library/Frameworks/CoreLocation.framework; sourceTree = SDKROOT; }; -/* End PBXFileReference section */ - -/* Begin PBXFrameworksBuildPhase section */ - 003C0C9E15A1F07200FF29F5 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 00ED0B7C15B07FEE0034FE7C /* CoreLocation.framework in Frameworks */, - 003C0CE215A33EEC00FF29F5 /* CoreAudio.framework in Frameworks */, - 003C0CE015A33EDE00FF29F5 /* CoreVideo.framework in Frameworks */, - 003C0CD915A33ECF00FF29F5 /* Accelerate.framework in Frameworks */, - 003C0CDA15A33ECF00FF29F5 /* AudioToolbox.framework in Frameworks */, - 003C0CDB15A33ECF00FF29F5 /* AudioUnit.framework in Frameworks */, - 003C0CDC15A33ECF00FF29F5 /* OpenGL.framework in Frameworks */, - 003C0CA615A1F07200FF29F5 /* Cocoa.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXFrameworksBuildPhase section */ - -/* Begin PBXGroup section */ - 003C0C9615A1F07200FF29F5 = { - isa = PBXGroup; - children = ( - 008F8C0815B4C72E00A7E125 /* Source */, - 003C0CA415A1F07200FF29F5 /* Frameworks */, - 003C0CA215A1F07200FF29F5 /* Products */, - ); - sourceTree = ""; - }; - 003C0CA215A1F07200FF29F5 /* Products */ = { - isa = PBXGroup; - children = ( - 003C0CA115A1F07200FF29F5 /* TestApp.app */, - ); - name = Products; - sourceTree = ""; - }; - 003C0CA415A1F07200FF29F5 /* Frameworks */ = { - isa = PBXGroup; - children = ( - 00ED0B7915B07FBC0034FE7C /* CoreLocation.framework */, - 003C0CE115A33EEC00FF29F5 /* CoreAudio.framework */, - 003C0CDF15A33EDE00FF29F5 /* CoreVideo.framework */, - 003C0CD315A33ECF00FF29F5 /* Accelerate.framework */, - 003C0CD415A33ECF00FF29F5 /* AudioToolbox.framework */, - 003C0CD515A33ECF00FF29F5 /* AudioUnit.framework */, - 003C0CD615A33ECF00FF29F5 /* OpenGL.framework */, - 003C0CA515A1F07200FF29F5 /* Cocoa.framework */, - 003C0CA715A1F07200FF29F5 /* Other Frameworks */, - ); - name = Frameworks; - sourceTree = ""; - }; - 003C0CA715A1F07200FF29F5 /* Other Frameworks */ = { - isa = PBXGroup; - children = ( - 003C0CA815A1F07200FF29F5 /* AppKit.framework */, - 003C0CA915A1F07200FF29F5 /* CoreData.framework */, - 003C0CAA15A1F07200FF29F5 /* Foundation.framework */, - ); - name = "Other Frameworks"; - sourceTree = ""; - }; - 008F8C0815B4C72E00A7E125 /* Source */ = { - isa = PBXGroup; - children = ( - ); - name = Source; - sourceTree = ""; - }; -/* End PBXGroup section */ - -/* Begin PBXNativeTarget section */ - 003C0CA015A1F07200FF29F5 /* TestApp */ = { - isa = PBXNativeTarget; - buildConfigurationList = 003C0CBF15A1F07300FF29F5 /* Build configuration list for PBXNativeTarget "TestApp" */; - buildPhases = ( - 003C0C9D15A1F07200FF29F5 /* Sources */, - 003C0C9E15A1F07200FF29F5 /* Frameworks */, - 003C0C9F15A1F07200FF29F5 /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = TestApp; - productName = TestApp; - productReference = 003C0CA115A1F07200FF29F5 /* TestApp.app */; - productType = "com.apple.product-type.application"; - }; -/* End PBXNativeTarget section */ - -/* Begin PBXProject section */ - 003C0C9815A1F07200FF29F5 /* Project object */ = { - isa = PBXProject; - attributes = { - LastUpgradeCheck = 0420; - }; - buildConfigurationList = 003C0C9B15A1F07200FF29F5 /* Build configuration list for PBXProject "TestApp" */; - compatibilityVersion = "Xcode 3.2"; - developmentRegion = English; - hasScannedForEncodings = 0; - knownRegions = ( - en, - ); - mainGroup = 003C0C9615A1F07200FF29F5; - productRefGroup = 003C0CA215A1F07200FF29F5 /* Products */; - projectDirPath = ""; - projectRoot = ""; - targets = ( - 003C0CA015A1F07200FF29F5 /* TestApp */, - ); - }; -/* End PBXProject section */ - -/* Begin PBXResourcesBuildPhase section */ - 003C0C9F15A1F07200FF29F5 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXResourcesBuildPhase section */ - -/* Begin PBXSourcesBuildPhase section */ - 003C0C9D15A1F07200FF29F5 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXSourcesBuildPhase section */ - -/* Begin XCBuildConfiguration section */ - 003C0CBD15A1F07300FF29F5 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_32_BIT)"; - CINDER_PATH = ../..; - COPY_PHASE_STRIP = NO; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_OBJC_EXCEPTIONS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - GCC_SYMBOLS_PRIVATE_EXTERN = NO; - GCC_VERSION = com.apple.compilers.llvm.clang.1_0; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - HEADER_SEARCH_PATHS = "$(CINDER_PATH)/boost"; - MACOSX_DEPLOYMENT_TARGET = 10.6; - ONLY_ACTIVE_ARCH = YES; - SDKROOT = macosx; - USER_HEADER_SEARCH_PATHS = "../TestApp $(CINDER_PATH)/include"; - }; - name = Debug; - }; - 003C0CBE15A1F07300FF29F5 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_32_BIT)"; - CINDER_PATH = ../..; - COPY_PHASE_STRIP = YES; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_ENABLE_OBJC_EXCEPTIONS = YES; - GCC_VERSION = com.apple.compilers.llvm.clang.1_0; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - HEADER_SEARCH_PATHS = "$(CINDER_PATH)/boost"; - MACOSX_DEPLOYMENT_TARGET = 10.6; - SDKROOT = macosx; - USER_HEADER_SEARCH_PATHS = "../TestApp $(CINDER_PATH)/include"; - }; - name = Release; - }; - 003C0CC015A1F07300FF29F5 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - DEAD_CODE_STRIPPING = YES; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "TestApp/TestApp-Prefix.pch"; - INFOPLIST_FILE = "TestApp/TestApp-Info.plist"; - OTHER_LDFLAGS = ( - "-ObjC", - "$(CINDER_PATH)/lib/libcinder_d.a", - ); - PRODUCT_NAME = "$(TARGET_NAME)"; - WRAPPER_EXTENSION = app; - }; - name = Debug; - }; - 003C0CC115A1F07300FF29F5 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - DEAD_CODE_STRIPPING = YES; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "TestApp/TestApp-Prefix.pch"; - INFOPLIST_FILE = "TestApp/TestApp-Info.plist"; - OTHER_LDFLAGS = ( - "-ObjC", - "$(CINDER_PATH)/lib/libcinder_d.a", - ); - PRODUCT_NAME = "$(TARGET_NAME)"; - WRAPPER_EXTENSION = app; - }; - name = Release; - }; -/* End XCBuildConfiguration section */ - -/* Begin XCConfigurationList section */ - 003C0C9B15A1F07200FF29F5 /* Build configuration list for PBXProject "TestApp" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 003C0CBD15A1F07300FF29F5 /* Debug */, - 003C0CBE15A1F07300FF29F5 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 003C0CBF15A1F07300FF29F5 /* Build configuration list for PBXNativeTarget "TestApp" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 003C0CC015A1F07300FF29F5 /* Debug */, - 003C0CC115A1F07300FF29F5 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; -/* End XCConfigurationList section */ - }; - rootObject = 003C0C9815A1F07200FF29F5 /* Project object */; -} diff --git a/blocks/__AppTemplates/CocoaView/OpenGL/xcode/_TBOX_PREFIX__Prefix.pch b/blocks/__AppTemplates/CocoaView/OpenGL/xcode/_TBOX_PREFIX__Prefix.pch deleted file mode 100644 index 9bbc46e8c5..0000000000 --- a/blocks/__AppTemplates/CocoaView/OpenGL/xcode/_TBOX_PREFIX__Prefix.pch +++ /dev/null @@ -1,11 +0,0 @@ -// -// Prefix header for all source files of the 'TestApp' target in the 'TestApp' project -// -#if defined( __cplusplus ) - #include "cinder/Cinder.h" - #include "cinder/gl/gl.h" -#endif - -#ifdef __OBJC__ - #import -#endif diff --git a/blocks/__AppTemplates/CocoaView/OpenGL/xcode/en.lproj/InfoPlist.strings b/blocks/__AppTemplates/CocoaView/OpenGL/xcode/en.lproj/InfoPlist.strings deleted file mode 100644 index 477b28ff8f..0000000000 --- a/blocks/__AppTemplates/CocoaView/OpenGL/xcode/en.lproj/InfoPlist.strings +++ /dev/null @@ -1,2 +0,0 @@ -/* Localized versions of Info.plist keys */ - diff --git a/blocks/__AppTemplates/CocoaView/OpenGL/xcode/en.lproj/MainMenu.xib b/blocks/__AppTemplates/CocoaView/OpenGL/xcode/en.lproj/MainMenu.xib deleted file mode 100644 index c1651d8149..0000000000 --- a/blocks/__AppTemplates/CocoaView/OpenGL/xcode/en.lproj/MainMenu.xib +++ /dev/null @@ -1,691 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Default - - - - - - - Left to Right - - - - - - - Right to Left - - - - - - - - - - - Default - - - - - - - Left to Right - - - - - - - Right to Left - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/blocks/__AppTemplates/ScreenSaver/OpenGL/include/Resources.h b/blocks/__AppTemplates/ScreenSaver/OpenGL/include/Resources.h deleted file mode 100644 index 0c2b8eca8c..0000000000 --- a/blocks/__AppTemplates/ScreenSaver/OpenGL/include/Resources.h +++ /dev/null @@ -1,5 +0,0 @@ -#pragma once -#include "cinder/CinderResources.h" - -//#define RES_NAME CINDER_RESOURCE( parent path, resource file name, unique integer ID, data type name ) -// Ex: RES_PARTICLE CINDER_RESOURCE( ../resources, particle.png, 128, PNG ) diff --git a/blocks/__AppTemplates/ScreenSaver/OpenGL/resources/cinder_app_icon.ico b/blocks/__AppTemplates/ScreenSaver/OpenGL/resources/cinder_app_icon.ico deleted file mode 100644 index b35fb854d8..0000000000 Binary files a/blocks/__AppTemplates/ScreenSaver/OpenGL/resources/cinder_app_icon.ico and /dev/null differ diff --git a/blocks/__AppTemplates/ScreenSaver/OpenGL/resources/thumbnail.png b/blocks/__AppTemplates/ScreenSaver/OpenGL/resources/thumbnail.png deleted file mode 100644 index d05ce9a459..0000000000 Binary files a/blocks/__AppTemplates/ScreenSaver/OpenGL/resources/thumbnail.png and /dev/null differ diff --git a/blocks/__AppTemplates/ScreenSaver/OpenGL/resources/thumbnail@2x.png b/blocks/__AppTemplates/ScreenSaver/OpenGL/resources/thumbnail@2x.png deleted file mode 100644 index fa4bf96043..0000000000 Binary files a/blocks/__AppTemplates/ScreenSaver/OpenGL/resources/thumbnail@2x.png and /dev/null differ diff --git a/blocks/__AppTemplates/ScreenSaver/OpenGL/src/_TBOX_PREFIX_App.cpp b/blocks/__AppTemplates/ScreenSaver/OpenGL/src/_TBOX_PREFIX_App.cpp deleted file mode 100644 index fc3e9c8542..0000000000 --- a/blocks/__AppTemplates/ScreenSaver/OpenGL/src/_TBOX_PREFIX_App.cpp +++ /dev/null @@ -1,37 +0,0 @@ -#include "cinder/app/AppScreenSaver.h" -#include "cinder/app/RendererGl.h" -#include "cinder/gl/gl.h" - -using namespace ci; -using namespace ci::app; - -class _TBOX_PREFIX_App : public AppScreenSaver { - public: - void setup() override; - void update() override; - void draw() override; - - protected: - ci::Color mColor, mBackgroundColor; - float mRadius; -}; - -void _TBOX_PREFIX_App::setup() -{ - mColor = Color( 1.0f, 0.5f, 0.25f ); - mBackgroundColor = Color( 0.25f, 0.0f, 0.0f ); -} - -void _TBOX_PREFIX_App::update() -{ - mRadius = abs( cos( getElapsedSeconds() ) * 200 ); -} - -void _TBOX_PREFIX_App::draw() -{ - gl::clear( mBackgroundColor ); - gl::color( mColor ); - gl::drawSolidCircle( getWindowCenter(), mRadius ); -} - -CINDER_APP_SCREENSAVER( _TBOX_PREFIX_App, RendererGl ) diff --git a/blocks/__AppTemplates/ScreenSaver/OpenGL/template.xml b/blocks/__AppTemplates/ScreenSaver/OpenGL/template.xml deleted file mode 100644 index 9b8c6446de..0000000000 --- a/blocks/__AppTemplates/ScreenSaver/OpenGL/template.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - \ No newline at end of file diff --git a/blocks/__AppTemplates/ScreenSaver/OpenGL/xcode/English.lproj/InfoPlist.strings b/blocks/__AppTemplates/ScreenSaver/OpenGL/xcode/English.lproj/InfoPlist.strings deleted file mode 100644 index e32dbfdce3..0000000000 Binary files a/blocks/__AppTemplates/ScreenSaver/OpenGL/xcode/English.lproj/InfoPlist.strings and /dev/null differ diff --git a/blocks/__AppTemplates/ScreenSaver/OpenGL/xcode/Info.plist b/blocks/__AppTemplates/ScreenSaver/OpenGL/xcode/Info.plist deleted file mode 100644 index 295640c7bc..0000000000 --- a/blocks/__AppTemplates/ScreenSaver/OpenGL/xcode/Info.plist +++ /dev/null @@ -1,28 +0,0 @@ - - - - - CFBundleName - ${PRODUCT_NAME} - CFBundleDevelopmentRegion - en - CFBundleExecutable - ${EXECUTABLE_NAME} - CFBundleIconFile - - CFBundleIdentifier - org.libcinder.${PRODUCT_NAME:rfc1034identifier} - CFBundleInfoDictionaryVersion - 6.0 - CFBundlePackageType - BNDL - CFBundleSignature - ???? - CFBundleVersion - 1 - CFBundleShortVersionString - 1.0 - NSPrincipalClass - WindowImplCocoaScreenSaver_TBOX_PREFIX_ - - diff --git a/blocks/__AppTemplates/ScreenSaver/OpenGL/xcode/_TBOX_PREFIX__Prefix.pch b/blocks/__AppTemplates/ScreenSaver/OpenGL/xcode/_TBOX_PREFIX__Prefix.pch deleted file mode 100644 index 49f3966289..0000000000 --- a/blocks/__AppTemplates/ScreenSaver/OpenGL/xcode/_TBOX_PREFIX__Prefix.pch +++ /dev/null @@ -1,21 +0,0 @@ -#ifdef __OBJC__ - #import -#endif - -// What manner of devilry is this? -// Unfortunately due to a deep design flaw in Objective-C based plugin schemes -// such as Mac OS X's screensaver mechanism, runtime class name collisions are -// essentially unsolvable. So we need navigate around this by -// a) including all of Cinder's obj-c classes directly in the project and -// b) renaming them to something unique using the preprocessor. Awful. - -#define CinderViewMac CinderViewMac_TBOX_PREFIX_ -#define RendererImplGlMac RendererImplGlMac_TBOX_PREFIX_ -#define RendererImpl2dMacQuartz RendererImpl2dMacQuartz_TBOX_PREFIX_ -#define RendererImplGlMacTransparentView RendererImplGlMacTransparentView_TBOX_PREFIX_ -#define AppImplMacScreenSaver AppImplMacScreenSaver_TBOX_PREFIX_ -#define WindowImplCocoaScreenSaver WindowImplCocoaScreenSaver_TBOX_PREFIX_ -#define CaptureImplQtKit CaptureImplQtKit_TBOX_PREFIX_ -#define CaptureImplQtKitDevice CaptureImplQtKitDevice_TBOX_PREFIX_ -#define IStreamUrlImplCocoaDelegate IStreamUrlImplCocoaDelegate_TBOX_PREFIX_ -#define IStreamUrlImplCocoa IStreamUrlImplCocoa_TBOX_PREFIX_ \ No newline at end of file diff --git a/include/cinder/GeomIo.h b/include/cinder/GeomIo.h index b9190d33df..ce10409ea8 100644 --- a/include/cinder/GeomIo.h +++ b/include/cinder/GeomIo.h @@ -226,6 +226,7 @@ class CI_API Rect : public Source { //! Enables TEX_COORD_0 attrib and specifies corner values in clockwise order starting with the upper-left Rect& texCoords( const vec2 &upperLeft, const vec2 &upperRight, const vec2 &lowerRight, const vec2 &lowerLeft ); + Rectf getRect() const { return Rectf(mPositions[0], mPositions[3]); }; size_t getNumVertices() const override { return 4; } size_t getNumIndices() const override { return 0; } Primitive getPrimitive() const override { return Primitive::TRIANGLE_STRIP; } @@ -254,6 +255,9 @@ class CI_API RoundedRect : public Source { RoundedRect& texCoords( const vec2 &upperLeft, const vec2 &lowerRight ); RoundedRect& colors( const ColorAf &upperLeft, const ColorAf &upperRight, const ColorAf &lowerRight, const ColorAf &lowerLeft ); + Rectf getRect() const { return mRectPositions; } + int getCornerSubdivisions() const { return mSubdivisions; } + float getCornerRadius() const { return mCornerRadius; } size_t getNumVertices() const override { return mNumVertices; } size_t getNumIndices() const override { return 0; } Primitive getPrimitive() const override { return Primitive::TRIANGLE_FAN; } @@ -290,7 +294,9 @@ class CI_API Cube : public Source { Cube& size( const vec3 &sz ) { mSize = sz; return *this; } Cube& size( float x, float y, float z ) { mSize = vec3( x, y, z ); return *this; } - size_t getNumVertices() const override; + vec3 getSize() const { return mSize; } + vec3 getSubdivisions() const { return mSubdivisions; } + size_t getNumVertices() const override; size_t getNumIndices() const override; Primitive getPrimitive() const override { return Primitive::TRIANGLES; } uint8_t getAttribDims( Attrib attr ) const override; @@ -322,7 +328,9 @@ class CI_API CubeSphere : public Source { CubeSphere& size( float x, float y, float z ) { mSize = vec3( x, y, z ); return *this; } CubeSphere& equalSpacing( bool enabled = true ) { mEqualSpacing = enabled; return *this; } - size_t getNumVertices() const override; + vec3 getSize() const { return mSize; } + vec3 getSubdivisions() const { return mSubdivisions; } + size_t getNumVertices() const override; size_t getNumIndices() const override; Primitive getPrimitive() const override { return Primitive::TRIANGLES; } uint8_t getAttribDims( Attrib attr ) const override; @@ -374,6 +382,7 @@ class CI_API Icosphere : public Source { Icosphere& subdivisions( int sub ) { mSubdivision = (sub > 0) ? (sub + 1) : 1; mCalculationsCached = false; return *this; } + int getSubdivisions() const { return mSubdivision; } size_t getNumVertices() const override { calculate(); return mPositions.size(); } size_t getNumIndices() const override { calculate(); return mIndices.size(); } Primitive getPrimitive() const override { return Primitive::TRIANGLES; } @@ -401,6 +410,7 @@ class CI_API Teapot : public Source { Teapot& subdivisions( int sub ); + int getSubdivisions() const { return mSubdivision; } size_t getNumVertices() const override { return mNumVertices; } size_t getNumIndices() const override { return mNumIndices; } Primitive getPrimitive() const override { return Primitive::TRIANGLES; } @@ -438,6 +448,9 @@ class CI_API Circle : public Source { Circle& radius( float radius ); Circle& subdivisions( int subdivs ); + vec2 getCenter() const { return mCenter; } + float getRadius() const { return mRadius; } + int getSubdivisions() const { return mNumSubdivisions; } size_t getNumVertices() const override; size_t getNumIndices() const override { return 0; } Primitive getPrimitive() const override { return Primitive::TRIANGLE_FAN; } @@ -464,6 +477,10 @@ class CI_API Ring : public Source { Ring& width( float width ); Ring& subdivisions( int subdivs ); + vec2 getCenter() const { return mCenter; } + float getRadius() const { return mRadius; } + float getWidth() const { return mWidth; } + int getSubdivisions() const { return mNumSubdivisions; } size_t getNumVertices() const override; size_t getNumIndices() const override { return 0; } Primitive getPrimitive() const override { return Primitive::TRIANGLE_STRIP; } @@ -493,6 +510,9 @@ class CI_API Sphere : public Source { //! Specifies the number of segments, which determines the roundness of the sphere. Sphere& subdivisions( int subdiv ) { mSubdivisions = subdiv; return *this; } + vec3 getCenter() const { return mCenter; } + float getRadius() const { return mRadius; } + int getSubdivisions() const { return mSubdivisions; } size_t getNumVertices() const override; size_t getNumIndices() const override; Primitive getPrimitive() const override { return Primitive::TRIANGLES; } @@ -527,6 +547,12 @@ class CI_API Capsule : public Source { //! Conveniently sets center, length and direction Capsule& set( const vec3 &from, const vec3 &to ); + vec3 getCenter() const { return mCenter; } + int getSubdivisionsAxis() const { return mSubdivisionsAxis; } + int getSubdivisionsHeight() const { return mSubdivisionsHeight; } + float getRadius() const { return mRadius; } + float getLength() const { return mLength; } + vec3 getDirection() const { return mDirection; } size_t getNumVertices() const override; size_t getNumIndices() const override; Primitive getPrimitive() const override { return Primitive::TRIANGLES; } @@ -565,6 +591,14 @@ class CI_API Torus : public Source { //! Specifies the major and minor radius separately. Torus& radius( float major, float minor ) { mRadiusMajor = math::max(0, major); mRadiusMinor = math::max(0, minor); return *this; } + vec3 getCenter() const { return mCenter; } + int getSubdivisionsAxis() const { return mSubdivisionsAxis; } + int getSubdivisionsHeight() const { return mSubdivisionsHeight; } + float getMajorRadius() const { return mRadiusMajor; } + float getMinorRadius() const { return mRadiusMinor; } + float getHeight() const { return mHeight; } + unsigned getTwist() const { return mTwist; } + float getTwistOffset() const { return mTwistOffset; } size_t getNumVertices() const override; size_t getNumIndices() const override; Primitive getPrimitive() const override { return Primitive::TRIANGLES; } @@ -607,6 +641,12 @@ class CI_API TorusKnot : public Source { //! Allows you to scale the generated curve. TorusKnot& scale( float x, float y, float z ) { mScale = vec3( x, y, z ); return *this; } + int getSubdivisionsAxis() const { return mSubdivisionsAxis; } + int getSubdivisionsHeight() const { return mSubdivisionsHeight; } + int getParameterP() const { return mP; } + int getParameterQ() const { return mQ; } + float getRadius() const { return mRadius; } + vec3 getScale() const { return mScale; } size_t getNumVertices() const override; size_t getNumIndices() const override; Primitive getPrimitive() const override { return Primitive::TRIANGLES; } @@ -666,6 +706,16 @@ class CI_API Helix : public Torus { Helix& ratio( float ratio ) { Torus::ratio( ratio ); return *this; } //! Specifies the major and minor radius separately. Helix& radius( float major, float minor ) { Torus::radius( major, minor ); return *this; } + + vec3 getCenter() const { return mCenter; } + int getSubdivisionsAxis() const { return mSubdivisionsAxis; } + int getSubdivisionsHeight() const { return mSubdivisionsHeight; } + float getMajorRadius() const { return mRadiusMajor; } + float getMinorRadius() const { return mRadiusMinor; } + float getHeight() const { return mHeight; } + unsigned getTwist() const { return mTwist; } + float getTwistOffset() const { return mTwistOffset; } + float getNumberOfCoils() const { return mCoils; } }; class CI_API Cylinder : public Source { @@ -692,6 +742,13 @@ class CI_API Cylinder : public Source { //! Conveniently sets origin, height and direction so that the center of the base is \a from and the center of the apex is \a to. Cylinder& set( const vec3 &from, const vec3 &to ); + vec3 getOrigin() const { return mOrigin; } + int getSubdivisionsAxis() const { return mSubdivisionsAxis; } + int getSubdivisionsHeight() const { return mSubdivisionsHeight; } + int getSubdivisionsCap() const { return mSubdivisionsCap; } + float getRadius() const { return mRadiusBase; } + float getHeight() const { return mHeight; } + vec3 getDirection() const { return mDirection; } size_t getNumVertices() const override; size_t getNumIndices() const override; Primitive getPrimitive() const override { return Primitive::TRIANGLES; } @@ -744,6 +801,14 @@ class CI_API Cone : public Cylinder { Cone& direction( const vec3 &direction ) { Cylinder::direction( direction ); return *this; } //! Conveniently sets origin, height and direction. Cone& set( const vec3 &from, const vec3 &to ) { Cylinder::set( from, to ); return *this; } + + vec3 getOrigin() const { return mOrigin; } + int getSubdivisionsAxis() const { return mSubdivisionsAxis; } + int getSubdivisionsHeight() const { return mSubdivisionsHeight; } + float getBaseRadius() const { return mRadiusBase; } + float getApexRadius() const { return mRadiusApex; } + float getHeight() const { return mHeight; } + vec3 getDirection() const { return mDirection; } }; //! Defaults to a plane on the z axis, origin = [0, 0, 0], normal = [0, 1, 0] @@ -760,6 +825,10 @@ class CI_API Plane : public Source { Plane& origin( const vec3 &origin ) { mOrigin = origin; return *this; } Plane& normal( const vec3 &normal ); + vec2 getSubdivisions() const { return mSubdivisions; } + vec3 getOrigin() const { return mOrigin; } + vec3 getNormal() const { return glm::cross(mAxisU, mAxisV); } + vec2 getSize() const { return mSize; } size_t getNumVertices() const override { return ( mSubdivisions.x + 1 ) * ( mSubdivisions.y + 1 ); } size_t getNumIndices() const override { return mSubdivisions.x * mSubdivisions.y * 6; } Primitive getPrimitive() const override { return Primitive::TRIANGLES; } @@ -789,6 +858,8 @@ class CI_API Extrude : public Source { //! Sets the number of subdivisions along the axis of extrusion Extrude& subdivisions( int sub ) { mSubdivisions = std::max( 1, sub ); updatePathSubdivision(); return *this; } + float getDistance() const { return mDistance; } + int getSubdivisions() const { return mSubdivisions; } size_t getNumVertices() const override; size_t getNumIndices() const override; Primitive getPrimitive() const override { return Primitive::TRIANGLES; } @@ -827,6 +898,7 @@ class CI_API ExtrudeSpline : public Source { //! Sets the function used to calculate the width of the Shape2d at each subdivision ExtrudeSpline& thickness( const std::function &fn ) { mThicknessFn = fn; return *this; } + int getSubdivisions() const { return mSubdivisions; } size_t getNumVertices() const override; size_t getNumIndices() const override; Primitive getPrimitive() const override { return Primitive::TRIANGLES; } @@ -913,6 +985,12 @@ class CI_API WireCapsule : public WireSource { //! Conveniently sets center, length and direction WireCapsule& set( const vec3 &from, const vec3 &to ); + vec3 getCenter() const { return mCenter; } + int getSubdivisionsAxis() const { return mSubdivisionsAxis; } + int getSubdivisionsHeight() const { return mSubdivisionsHeight; } + float getRadius() const { return mRadius; } + float getLength() const { return mLength; } + vec3 getDirection() const { return mDirection; } size_t getNumVertices() const override; void loadInto( Target *target, const AttribSet &requestedAttribs ) const override; WireCapsule* clone() const override { return new WireCapsule( *this ); } diff --git a/src/cinder/GeomIo.cpp b/src/cinder/GeomIo.cpp index 8a48f60586..6e4ba4777b 100644 --- a/src/cinder/GeomIo.cpp +++ b/src/cinder/GeomIo.cpp @@ -761,7 +761,7 @@ RoundedRect& RoundedRect::colors( const ColorAf &upperLeft, const ColorAf &upper mColors[3] = upperLeft; return *this; } - + void RoundedRect::updateVertexCount() { if( mSubdivisions <= 0 ) { @@ -940,8 +940,7 @@ Cube& Cube::colors( const ColorAf &posX, const ColorAf &negX, const ColorAf &pos return *this; } -size_t Cube::getNumVertices() const -{ +size_t Cube::getNumVertices() const { return 2 * ( (mSubdivisions.x+1) * (mSubdivisions.y+1) ) // +-Z + 2 * ( (mSubdivisions.y+1) * (mSubdivisions.z+1) ) // +-X + 2 * ( (mSubdivisions.x+1) * (mSubdivisions.z+1) ); // +-Y @@ -1111,8 +1110,7 @@ CubeSphere& CubeSphere::colors( const ColorAf &posX, const ColorAf &negX, const return *this; } -size_t CubeSphere::getNumVertices() const -{ +size_t CubeSphere::getNumVertices() const { return 2 * ( (mSubdivisions.x+1) * (mSubdivisions.y+1) ) // +-Z + 2 * ( (mSubdivisions.y+1) * (mSubdivisions.z+1) ) // +-X + 2 * ( (mSubdivisions.x+1) * (mSubdivisions.z+1) ); // +-Y