From 8b005ba4cebd9909496e0d032770efe9844b5675 Mon Sep 17 00:00:00 2001 From: Tim Redfern Date: Mon, 2 Jan 2012 01:40:11 +0000 Subject: camera light orbiting not working --- map4.xcodeproj/project.pbxproj | 18 + map4.xcodeproj/tim.mode1v3 | 64 ++-- map4.xcodeproj/tim.pbxuser | 742 ++++++++++++++++++++++++++++++++++++++--- src/main.cpp | 2 +- src/mapUtils.cpp | 22 +- src/mapUtils.h | 1 + src/testApp.cpp | 78 +---- src/testApp.h | 1 - src/viewpoint.cpp | 33 +- src/viewpoint.h | 7 +- 10 files changed, 818 insertions(+), 150 deletions(-) diff --git a/map4.xcodeproj/project.pbxproj b/map4.xcodeproj/project.pbxproj index a5c3909..c178092 100644 --- a/map4.xcodeproj/project.pbxproj +++ b/map4.xcodeproj/project.pbxproj @@ -10,6 +10,9 @@ 220EA1CE14925A00004424ED /* ofx3dModelLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 220EA1CC14925A00004424ED /* ofx3dModelLoader.cpp */; }; 220EA1E314925ACB004424ED /* model3DS.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 220EA1DE14925ACB004424ED /* model3DS.cpp */; }; 220EA1E414925ACB004424ED /* texture3DS.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 220EA1E014925ACB004424ED /* texture3DS.cpp */; }; + 223429A514AF70B100D0B406 /* keyVar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 223429A114AF70B100D0B406 /* keyVar.cpp */; }; + 223429A614AF70B100D0B406 /* viewpoint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 223429A314AF70B100D0B406 /* viewpoint.cpp */; }; + 22EF433A14AF89EF003C3497 /* mapUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 22EF433814AF89EF003C3497 /* mapUtils.cpp */; }; BBAB23CB13894F3D00AA2426 /* GLUT.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = BBAB23BE13894E4700AA2426 /* GLUT.framework */; }; E4328149138ABC9F0047C5CB /* openFrameworksDebug.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E4328148138ABC890047C5CB /* openFrameworksDebug.a */; }; E45BE97B0E8CC7DD009D7055 /* AGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E45BE9710E8CC7DD009D7055 /* AGL.framework */; }; @@ -68,6 +71,12 @@ 220EA1E114925ACB004424ED /* texture3DS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = texture3DS.h; path = Library/openFrameworks/addons/ofx3DModelLoader/src/3DS/texture3DS.h; sourceTree = SYSTEM_DEVELOPER_DIR; }; 220EA1E214925ACB004424ED /* Vector3DS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Vector3DS.h; path = Library/openFrameworks/addons/ofx3DModelLoader/src/3DS/Vector3DS.h; sourceTree = SYSTEM_DEVELOPER_DIR; }; 220EA2581492649B004424ED /* 3dnavDebug.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = 3dnavDebug.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 223429A114AF70B100D0B406 /* keyVar.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = keyVar.cpp; path = Library/openFrameworks/custom/dev/map4/src/keyVar.cpp; sourceTree = SYSTEM_DEVELOPER_DIR; }; + 223429A214AF70B100D0B406 /* keyVar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = keyVar.h; path = Library/openFrameworks/custom/dev/map4/src/keyVar.h; sourceTree = SYSTEM_DEVELOPER_DIR; }; + 223429A314AF70B100D0B406 /* viewpoint.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = viewpoint.cpp; path = Library/openFrameworks/custom/dev/map4/src/viewpoint.cpp; sourceTree = SYSTEM_DEVELOPER_DIR; }; + 223429A414AF70B100D0B406 /* viewpoint.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = viewpoint.h; path = Library/openFrameworks/custom/dev/map4/src/viewpoint.h; sourceTree = SYSTEM_DEVELOPER_DIR; }; + 22EF433814AF89EF003C3497 /* mapUtils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = mapUtils.cpp; path = Library/openFrameworks/custom/dev/map4/src/mapUtils.cpp; sourceTree = SYSTEM_DEVELOPER_DIR; }; + 22EF433914AF89EF003C3497 /* mapUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = mapUtils.h; path = Library/openFrameworks/custom/dev/map4/src/mapUtils.h; sourceTree = SYSTEM_DEVELOPER_DIR; }; BBAB23BE13894E4700AA2426 /* GLUT.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GLUT.framework; path = ../../../libs/glut/lib/osx/GLUT.framework; sourceTree = ""; }; E4328143138ABC890047C5CB /* openFrameworksLib.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = openFrameworksLib.xcodeproj; path = ../../../libs/openFrameworksCompiled/project/osx/openFrameworksLib.xcodeproj; sourceTree = SOURCE_ROOT; }; E45BE9710E8CC7DD009D7055 /* AGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AGL.framework; path = /System/Library/Frameworks/AGL.framework; sourceTree = ""; }; @@ -189,6 +198,12 @@ E4B69E1C0A3A1BDC003C02F2 /* src */ = { isa = PBXGroup; children = ( + 22EF433814AF89EF003C3497 /* mapUtils.cpp */, + 22EF433914AF89EF003C3497 /* mapUtils.h */, + 223429A114AF70B100D0B406 /* keyVar.cpp */, + 223429A214AF70B100D0B406 /* keyVar.h */, + 223429A314AF70B100D0B406 /* viewpoint.cpp */, + 223429A414AF70B100D0B406 /* viewpoint.h */, E4B69E1D0A3A1BDC003C02F2 /* main.cpp */, E4B69E1E0A3A1BDC003C02F2 /* testApp.cpp */, E4B69E1F0A3A1BDC003C02F2 /* testApp.h */, @@ -294,6 +309,9 @@ 220EA1CE14925A00004424ED /* ofx3dModelLoader.cpp in Sources */, 220EA1E314925ACB004424ED /* model3DS.cpp in Sources */, 220EA1E414925ACB004424ED /* texture3DS.cpp in Sources */, + 223429A514AF70B100D0B406 /* keyVar.cpp in Sources */, + 223429A614AF70B100D0B406 /* viewpoint.cpp in Sources */, + 22EF433A14AF89EF003C3497 /* mapUtils.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/map4.xcodeproj/tim.mode1v3 b/map4.xcodeproj/tim.mode1v3 index 9bd8be6..a1eedf8 100644 --- a/map4.xcodeproj/tim.mode1v3 +++ b/map4.xcodeproj/tim.mode1v3 @@ -229,8 +229,6 @@ Layout - BecomeActive - ContentConfiguration PBXBottomSmartGroupGIDs @@ -273,7 +271,7 @@ PBXSmartGroupTreeModuleOutlineStateSelectionKey - 5 + 8 3 0 @@ -309,12 +307,14 @@ Dock + BecomeActive + ContentConfiguration PBXProjectModuleGUID 1CE0B20306471E060097A5F4 PBXProjectModuleLabel - testApp.cpp + viewpoint.cpp PBXSplitModuleInNavigatorKey Split0 @@ -322,20 +322,26 @@ PBXProjectModuleGUID 1CE0B20406471E060097A5F4 PBXProjectModuleLabel - testApp.cpp + viewpoint.cpp _historyCapacity 0 bookmark - 22A7E780149930E60061596E + 2257104E14B140C4009BC2A4 history - 220EA1ED14925D45004424ED 220EA1EF14925D45004424ED - 220EA2351492640C004424ED - 220EA26014926528004424ED 22AFFECF149798EE0079DDC5 22AFFED1149798EE0079DDC5 - 22A7E77F149930E60061596E + 22570F8114B111F1009BC2A4 + 22570F8214B111F1009BC2A4 + 22570FEF14B131A0009BC2A4 + 2257100114B13857009BC2A4 + 2257100214B13857009BC2A4 + 2257104214B1404F009BC2A4 + 2257104414B1404F009BC2A4 + 2257104514B1404F009BC2A4 + 2257104614B1404F009BC2A4 + 2257104714B1404F009BC2A4 SplitCount @@ -347,14 +353,14 @@ GeometryConfiguration Frame - {{0, 0}, {816, 364}} + {{0, 0}, {816, 425}} RubberWindowFrame 0 59 1024 519 0 0 1024 578 Module PBXNavigatorGroup Proportion - 364pt + 425pt ContentConfiguration @@ -367,14 +373,14 @@ GeometryConfiguration Frame - {{0, 369}, {816, 109}} + {{0, 430}, {816, 48}} RubberWindowFrame 0 59 1024 519 0 0 1024 578 Module XCDetailModule Proportion - 109pt + 48pt Proportion @@ -393,9 +399,9 @@ TableOfContents - 22A7E781149930E60061596E + 22570F8614B111F1009BC2A4 1CE0B1FE06471DED0097A5F4 - 22A7E782149930E60061596E + 22570F8714B111F1009BC2A4 1CE0B20306471E060097A5F4 1CE0B20506471E060097A5F4 @@ -533,6 +539,10 @@ 5 WindowOrderList + 2257104F14B140C4009BC2A4 + 22570F8914B111F1009BC2A4 + 22570F8A14B111F1009BC2A4 + 1C78EAAD065D492600B07095 1CD10A99069EF8BA00B06720 22C080D114918C2F00E6B4C0 /Developer/Library/openFrameworks/custom/dev/map4/map4.xcodeproj @@ -559,7 +569,7 @@ PBXProjectModuleGUID 1CD0528F0623707200166675 PBXProjectModuleLabel - + viewpoint.cpp StatusBarVisibility @@ -576,6 +586,8 @@ 183pt + BecomeActive + ContentConfiguration PBXProjectModuleGUID @@ -615,7 +627,7 @@ TableOfContents 22C080D114918C2F00E6B4C0 - 22A7E783149930E60061596E + 22570F6C14B11123009BC2A4 1CD0528F0623707200166675 XCMainBuildResultsModuleGUID @@ -737,13 +749,13 @@ TableOfContents 1CD10A99069EF8BA00B06720 - 22A7E784149930E60061596E + 22570F6D14B11123009BC2A4 1C162984064C10D400B95A72 - 22A7E785149930E60061596E - 22A7E786149930E60061596E - 22A7E787149930E60061596E - 22A7E788149930E60061596E - 22A7E789149930E60061596E + 22570F6E14B11123009BC2A4 + 22570F6F14B11123009BC2A4 + 22570F7014B11123009BC2A4 + 22570F7114B11123009BC2A4 + 22570F7214B11123009BC2A4 ToolbarConfiguration xcode.toolbar.config.debugV3 @@ -870,8 +882,6 @@ Dock - BecomeActive - ContentConfiguration PBXProjectModuleGUID @@ -907,7 +917,7 @@ TableOfContents 1C78EAAD065D492600B07095 - 22AFFECE149798ED0079DDC5 + 22570F7314B11123009BC2A4 1C78EAAC065D492600B07095 ToolbarConfiguration diff --git a/map4.xcodeproj/tim.pbxuser b/map4.xcodeproj/tim.pbxuser index d232935..c3c370d 100644 --- a/map4.xcodeproj/tim.pbxuser +++ b/map4.xcodeproj/tim.pbxuser @@ -28,22 +28,17 @@ vrLen = 542; vrLoc = 0; }; - 220EA2351492640C004424ED /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = E4B69E1F0A3A1BDC003C02F2 /* testApp.h */; - name = "testApp.h: 47"; - rLen = 0; - rLoc = 916; - rType = 0; - vrLen = 487; - vrLoc = 432; - }; 220EA23A1492640C004424ED /* testApp.cpp */ = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = testApp.cpp; path = /Developer/Library/openFrameworks/custom/dev/3dnav/src/testApp.cpp; sourceTree = ""; + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {755, 6500}}"; + sepNavSelRange = "{1188, 127}"; + sepNavVisRange = "{1547, 647}"; + }; }; 220EA2591492649C004424ED /* 3dnav */ = { isa = PBXExecutable; @@ -85,24 +80,625 @@ vrLen = 562; vrLoc = 5436; }; - 22A7E77F149930E60061596E /* PBXTextBookmark */ = { + 223429A114AF70B100D0B406 /* keyVar.cpp */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {755, 702}}"; + sepNavSelRange = "{1243, 0}"; + sepNavVisRange = "{466, 820}"; + }; + }; + 223429A314AF70B100D0B406 /* viewpoint.cpp */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {742, 1599}}"; + sepNavSelRange = "{327, 0}"; + sepNavVisRange = "{250, 325}"; + }; + }; + 223429A414AF70B100D0B406 /* viewpoint.h */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {755, 572}}"; + sepNavSelRange = "{650, 0}"; + sepNavVisRange = "{175, 480}"; + }; + }; + 223429B714AF70F500D0B406 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = E4B69E1E0A3A1BDC003C02F2 /* testApp.cpp */; + name = "testApp.cpp: 192"; + rLen = 0; + rLoc = 3100; + rType = 0; + vrLen = 589; + vrLoc = 1133; + }; + 22570F6A14B11123009BC2A4 /* XCBuildMessageTextBookmark */ = { + isa = PBXTextBookmark; + comments = "'glTranslate' was not declared in this scope"; + fRef = 22EF433814AF89EF003C3497 /* mapUtils.cpp */; + fallbackIsa = XCBuildMessageTextBookmark; + rLen = 1; + rLoc = 79; + rType = 1; + }; + 22570F6B14B11123009BC2A4 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 22EF433814AF89EF003C3497 /* mapUtils.cpp */; + name = "mapUtils.cpp: 80"; + rLen = 0; + rLoc = 3885; + rType = 0; + vrLen = 271; + vrLoc = 3840; + }; + 22570F7914B1116E009BC2A4 /* XCBuildMessageTextBookmark */ = { + isa = PBXTextBookmark; + comments = "'cx' was not declared in this scope"; + fRef = 22EF433814AF89EF003C3497 /* mapUtils.cpp */; + fallbackIsa = XCBuildMessageTextBookmark; + rLen = 1; + rLoc = 84; + rType = 1; + }; + 22570F7A14B1116E009BC2A4 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 22EF433814AF89EF003C3497 /* mapUtils.cpp */; + name = "mapUtils.cpp: 83"; + rLen = 0; + rLoc = 3990; + rType = 0; + vrLen = 271; + vrLoc = 3827; + }; + 22570F8114B111F1009BC2A4 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = E4B69E1D0A3A1BDC003C02F2 /* main.cpp */; + name = "main.cpp: 9"; + rLen = 0; + rLoc = 220; + rType = 0; + vrLen = 448; + vrLoc = 0; + }; + 22570F8214B111F1009BC2A4 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 22EF433914AF89EF003C3497 /* mapUtils.h */; + name = "mapUtils.h: 16"; + rLen = 0; + rLoc = 327; + rType = 0; + vrLen = 329; + vrLoc = 0; + }; + 22570F8314B111F1009BC2A4 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = E4B69E1E0A3A1BDC003C02F2 /* testApp.cpp */; + name = "testApp.cpp: 86"; + rLen = 0; + rLoc = 1210; + rType = 0; + vrLen = 824; + vrLoc = 2267; + }; + 22570F8414B111F1009BC2A4 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 22EF433814AF89EF003C3497 /* mapUtils.cpp */; + name = "mapUtils.cpp: 79"; + rLen = 0; + rLoc = 3885; + rType = 0; + vrLen = 1347; + vrLoc = 2780; + }; + 22570F8514B111F1009BC2A4 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 22EF433814AF89EF003C3497 /* mapUtils.cpp */; + name = "mapUtils.cpp: 79"; + rLen = 0; + rLoc = 3898; + rType = 0; + vrLen = 1367; + vrLoc = 2780; + }; + 22570F8F14B11236009BC2A4 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 22EF433814AF89EF003C3497 /* mapUtils.cpp */; + name = "mapUtils.cpp: 79"; + rLen = 0; + rLoc = 3898; + rType = 0; + vrLen = 1428; + vrLoc = 576; + }; + 22570F9014B11236009BC2A4 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = E4B69E1E0A3A1BDC003C02F2 /* testApp.cpp */; + name = "testApp.cpp: 86"; + rLen = 0; + rLoc = 1210; + rType = 0; + vrLen = 909; + vrLoc = 2182; + }; + 22570F9114B11236009BC2A4 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = E4B69E1E0A3A1BDC003C02F2 /* testApp.cpp */; + name = "testApp.cpp: 87"; + rLen = 0; + rLoc = 1239; + rType = 0; + vrLen = 905; + vrLoc = 2182; + }; + 22570F9714B11260009BC2A4 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = E4B69E1E0A3A1BDC003C02F2 /* testApp.cpp */; + name = "testApp.cpp: 87"; + rLen = 0; + rLoc = 1239; + rType = 0; + vrLen = 906; + vrLoc = 2182; + }; + 22570F9D14B112DF009BC2A4 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = E4B69E1E0A3A1BDC003C02F2 /* testApp.cpp */; + name = "testApp.cpp: 43"; + rLen = 0; + rLoc = 605; + rType = 0; + vrLen = 954; + vrLoc = 634; + }; + 22570FA314B113A9009BC2A4 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = E4B69E1E0A3A1BDC003C02F2 /* testApp.cpp */; + name = "testApp.cpp: 87"; + rLen = 0; + rLoc = 1239; + rType = 0; + vrLen = 1016; + vrLoc = 0; + }; + 22570FA414B113A9009BC2A4 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 223429A314AF70B100D0B406 /* viewpoint.cpp */; + name = "viewpoint.cpp: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 851; + vrLoc = 0; + }; + 22570FA514B113A9009BC2A4 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 223429A314AF70B100D0B406 /* viewpoint.cpp */; + name = "viewpoint.cpp: 22"; + rLen = 0; + rLoc = 546; + rType = 0; + vrLen = 767; + vrLoc = 150; + }; + 22570FAB14B11411009BC2A4 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 223429A314AF70B100D0B406 /* viewpoint.cpp */; + name = "viewpoint.cpp: 22"; + rLen = 0; + rLoc = 546; + rType = 0; + vrLen = 858; + vrLoc = 40; + }; + 22570FAC14B11411009BC2A4 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = E4B69E1E0A3A1BDC003C02F2 /* testApp.cpp */; + name = "testApp.cpp: 87"; + rLen = 0; + rLoc = 1239; + rType = 0; + vrLen = 1016; + vrLoc = 0; + }; + 22570FAD14B11411009BC2A4 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = E4B69E1E0A3A1BDC003C02F2 /* testApp.cpp */; + name = "testApp.cpp: 87"; + rLen = 0; + rLoc = 1242; + rType = 0; + vrLen = 821; + vrLoc = 2265; + }; + 22570FB314B11435009BC2A4 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = E4B69E1E0A3A1BDC003C02F2 /* testApp.cpp */; + name = "testApp.cpp: 87"; + rLen = 0; + rLoc = 1239; + rType = 0; + vrLen = 822; + vrLoc = 2265; + }; + 22570FB914B11477009BC2A4 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = E4B69E1E0A3A1BDC003C02F2 /* testApp.cpp */; + name = "testApp.cpp: 87"; + rLen = 0; + rLoc = 1242; + rType = 0; + vrLen = 821; + vrLoc = 2265; + }; + 22570FBF14B114A4009BC2A4 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = E4B69E1E0A3A1BDC003C02F2 /* testApp.cpp */; + name = "testApp.cpp: 87"; + rLen = 0; + rLoc = 1242; + rType = 0; + vrLen = 821; + vrLoc = 2265; + }; + 22570FC714B114D3009BC2A4 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = E4B69E1E0A3A1BDC003C02F2 /* testApp.cpp */; + name = "testApp.cpp: 87"; + rLen = 0; + rLoc = 1241; + rType = 0; + vrLen = 821; + vrLoc = 2265; + }; + 22570FDB14B130F0009BC2A4 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 22EF433814AF89EF003C3497 /* mapUtils.cpp */; + name = "mapUtils.cpp: 84"; + rLen = 0; + rLoc = 3993; + rType = 0; + vrLen = 284; + vrLoc = 3770; + }; + 22570FDC14B130F0009BC2A4 /* XCBuildMessageTextBookmark */ = { + isa = PBXTextBookmark; + comments = "Expected `;' before '{' token"; + fRef = 223429A314AF70B100D0B406 /* viewpoint.cpp */; + fallbackIsa = XCBuildMessageTextBookmark; + rLen = 1; + rLoc = 15; + rType = 1; + }; + 22570FDD14B130F0009BC2A4 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 223429A314AF70B100D0B406 /* viewpoint.cpp */; + name = "viewpoint.cpp: 17"; + rLen = 0; + rLoc = 327; + rType = 0; + vrLen = 270; + vrLoc = 256; + }; + 22570FEA14B131A0009BC2A4 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = E4B69E1E0A3A1BDC003C02F2 /* testApp.cpp */; + name = "testApp.cpp: 67"; + rLen = 0; + rLoc = 1059; + rType = 0; + vrLen = 901; + vrLoc = 1358; + }; + 22570FEB14B131A0009BC2A4 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 22570FEC14B131A0009BC2A4 /* ofCamera.h */; + name = "ofCamera.h: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 1109; + vrLoc = 857; + }; + 22570FEC14B131A0009BC2A4 /* ofCamera.h */ = { + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.h; + name = ofCamera.h; + path = /Developer/Library/openFrameworks/libs/openFrameworks/3d/ofCamera.h; + sourceTree = ""; + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {1573, 988}}"; + sepNavSelRange = "{0, 0}"; + sepNavVisRange = "{0, 830}"; + }; + }; + 22570FED14B131A0009BC2A4 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 22570FEE14B131A0009BC2A4 /* ofNode.h */; + name = "ofNode.h: 65"; + rLen = 27; + rLoc = 1539; + rType = 0; + vrLen = 819; + vrLoc = 833; + }; + 22570FEE14B131A0009BC2A4 /* ofNode.h */ = { + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.h; + name = ofNode.h; + path = /Developer/Library/openFrameworks/libs/openFrameworks/3d/ofNode.h; + sourceTree = ""; + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {971, 2249}}"; + sepNavSelRange = "{3923, 78}"; + sepNavVisRange = "{3279, 1296}"; + }; + }; + 22570FEF14B131A0009BC2A4 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 223429A414AF70B100D0B406 /* viewpoint.h */; + name = "viewpoint.h: 41"; + rLen = 0; + rLoc = 650; + rType = 0; + vrLen = 480; + vrLoc = 175; + }; + 22570FF014B131A0009BC2A4 /* XCBuildMessageTextBookmark */ = { + isa = PBXTextBookmark; + comments = "Expected `;' before '{' token"; + fRef = 223429A314AF70B100D0B406 /* viewpoint.cpp */; + fallbackIsa = XCBuildMessageTextBookmark; + rLen = 1; + rLoc = 15; + rType = 1; + }; + 22570FF114B131A0009BC2A4 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 223429A314AF70B100D0B406 /* viewpoint.cpp */; + name = "viewpoint.cpp: 37"; + rLen = 0; + rLoc = 1292; + rType = 0; + vrLen = 941; + vrLoc = 282; + }; + 2257100114B13857009BC2A4 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = E4B69E1F0A3A1BDC003C02F2 /* testApp.h */; + name = "testApp.h: 49"; + rLen = 0; + rLoc = 1159; + rType = 0; + vrLen = 627; + vrLoc = 649; + }; + 2257100214B13857009BC2A4 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 22570FEE14B131A0009BC2A4 /* ofNode.h */; + name = "ofNode.h: 125"; + rLen = 78; + rLoc = 3923; + rType = 0; + vrLen = 1296; + vrLoc = 3279; + }; + 2257100314B13857009BC2A4 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = E4B69E1E0A3A1BDC003C02F2 /* testApp.cpp */; - name = "testApp.cpp: 405"; + name = "testApp.cpp: 20"; + rLen = 0; + rLoc = 569; + rType = 0; + vrLen = 724; + vrLoc = 313; + }; + 2257100414B13857009BC2A4 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 223429A314AF70B100D0B406 /* viewpoint.cpp */; + name = "viewpoint.cpp: 58"; + rLen = 0; + rLoc = 1644; + rType = 0; + vrLen = 791; + vrLoc = 874; + }; + 2257100514B13857009BC2A4 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 223429A314AF70B100D0B406 /* viewpoint.cpp */; + name = "viewpoint.cpp: 34"; + rLen = 0; + rLoc = 896; + rType = 0; + vrLen = 883; + vrLoc = 762; + }; + 2257100B14B13899009BC2A4 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 223429A314AF70B100D0B406 /* viewpoint.cpp */; + name = "viewpoint.cpp: 34"; + rLen = 0; + rLoc = 896; + rType = 0; + vrLen = 951; + vrLoc = 762; + }; + 2257101114B13A0D009BC2A4 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = E4B69E1E0A3A1BDC003C02F2 /* testApp.cpp */; + name = "testApp.cpp: 20"; + rLen = 0; + rLoc = 569; + rType = 0; + vrLen = 741; + vrLoc = 0; + }; + 2257101214B13A0D009BC2A4 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 223429A314AF70B100D0B406 /* viewpoint.cpp */; + name = "viewpoint.cpp: 52"; rLen = 0; - rLoc = 10198; + rLoc = 1606; rType = 0; - vrLen = 1045; - vrLoc = 373; + vrLen = 991; + vrLoc = 487; }; - 22A7E780149930E60061596E /* PBXTextBookmark */ = { + 2257101314B13A0D009BC2A4 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 223429A314AF70B100D0B406 /* viewpoint.cpp */; + name = "viewpoint.cpp: 37"; + rLen = 0; + rLoc = 1250; + rType = 0; + vrLen = 954; + vrLoc = 874; + }; + 2257101914B13A7A009BC2A4 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 223429A314AF70B100D0B406 /* viewpoint.cpp */; + name = "viewpoint.cpp: 30"; + rLen = 0; + rLoc = 760; + rType = 0; + vrLen = 832; + vrLoc = 40; + }; + 2257101F14B13B41009BC2A4 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 223429A314AF70B100D0B406 /* viewpoint.cpp */; + name = "viewpoint.cpp: 36"; + rLen = 0; + rLoc = 1250; + rType = 0; + vrLen = 1042; + vrLoc = 282; + }; + 2257102514B13BE9009BC2A4 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 223429A314AF70B100D0B406 /* viewpoint.cpp */; + name = "viewpoint.cpp: 16"; + rLen = 0; + rLoc = 302; + rType = 0; + vrLen = 858; + vrLoc = 39; + }; + 2257102B14B13C70009BC2A4 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 223429A314AF70B100D0B406 /* viewpoint.cpp */; + name = "viewpoint.cpp: 16"; + rLen = 0; + rLoc = 302; + rType = 0; + vrLen = 1232; + vrLoc = 352; + }; + 2257103114B13CAA009BC2A4 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 223429A314AF70B100D0B406 /* viewpoint.cpp */; + name = "viewpoint.cpp: 16"; + rLen = 0; + rLoc = 302; + rType = 0; + vrLen = 995; + vrLoc = 256; + }; + 2257104214B1404F009BC2A4 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 2257104314B1404F009BC2A4 /* ofNode.cpp */; + name = "ofNode.cpp: 341"; + rLen = 0; + rLoc = 7725; + rType = 0; + vrLen = 826; + vrLoc = 7725; + }; + 2257104314B1404F009BC2A4 /* ofNode.cpp */ = { + isa = PBXFileReference; + name = ofNode.cpp; + path = /Developer/Library/openFrameworks/libs/openFrameworks/3d/ofNode.cpp; + sourceTree = ""; + }; + 2257104414B1404F009BC2A4 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 22570FEC14B131A0009BC2A4 /* ofCamera.h */; + name = "ofCamera.h: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 830; + vrLoc = 0; + }; + 2257104514B1404F009BC2A4 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 22EF433814AF89EF003C3497 /* mapUtils.cpp */; + name = "mapUtils.cpp: 11"; + rLen = 0; + rLoc = 171; + rType = 0; + vrLen = 848; + vrLoc = 109; + }; + 2257104614B1404F009BC2A4 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = E4B69E1E0A3A1BDC003C02F2 /* testApp.cpp */; - name = "testApp.cpp: 405"; + name = "testApp.cpp: 20"; + rLen = 0; + rLoc = 569; + rType = 0; + vrLen = 771; + vrLoc = 1365; + }; + 2257104714B1404F009BC2A4 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 223429A314AF70B100D0B406 /* viewpoint.cpp */; + name = "viewpoint.cpp: 41"; + rLen = 0; + rLoc = 1198; + rType = 0; + vrLen = 1028; + vrLoc = 522; + }; + 2257104814B1404F009BC2A4 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 223429A314AF70B100D0B406 /* viewpoint.cpp */; + name = "viewpoint.cpp: 40"; + rLen = 0; + rLoc = 1180; + rType = 0; + vrLen = 912; + vrLoc = 676; + }; + 2257104E14B140C4009BC2A4 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 223429A314AF70B100D0B406 /* viewpoint.cpp */; + name = "viewpoint.cpp: 40"; rLen = 0; - rLoc = 10198; + rLoc = 1168; rType = 0; - vrLen = 852; + vrLen = 912; + vrLoc = 676; + }; + 22A78E7514B0A80400EAEEDB /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = E4B69E1F0A3A1BDC003C02F2 /* testApp.h */; + name = "testApp.h: 29"; + rLen = 0; + rLoc = 649; + rType = 0; + vrLen = 472; + vrLoc = 409; + }; + 22A78E7614B0A80400EAEEDB /* PBXBookmark */ = { + isa = PBXBookmark; + fRef = E4B69E1D0A3A1BDC003C02F2 /* main.cpp */; + }; + 22A78E7714B0A80400EAEEDB /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = E4B69E1D0A3A1BDC003C02F2 /* main.cpp */; + name = "main.cpp: 9"; + rLen = 0; + rLoc = 220; + rType = 0; + vrLen = 448; vrLoc = 0; }; 22AFFECF149798EE0079DDC5 /* PBXTextBookmark */ = { @@ -153,6 +749,21 @@ isa = PBXCodeSenseManager; indexTemplatePath = ""; }; + 22EF433814AF89EF003C3497 /* mapUtils.cpp */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {755, 1508}}"; + sepNavSelRange = "{171, 0}"; + sepNavVisRange = "{109, 848}"; + sepNavWindowFrame = "{{15, 4}, {976, 574}}"; + }; + }; + 22EF433914AF89EF003C3497 /* mapUtils.h */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {755, 393}}"; + sepNavSelRange = "{327, 0}"; + sepNavVisRange = "{0, 329}"; + }; + }; E4B69B4C0A3A1720003C02F2 /* Project object */ = { activeBuildConfigurationName = Debug; activeExecutable = 220EA2591492649C004424ED /* 3dnav */; @@ -187,18 +798,73 @@ PBXFileDataSource_Target_ColumnID, ); }; - PBXPerProjectTemplateStateSaveDate = 345583833; - PBXWorkspaceStateSaveDate = 345583833; + PBXPerProjectTemplateStateSaveDate = 347147300; + PBXWorkspaceStateSaveDate = 347147300; }; perUserProjectItems = { - 220EA1ED14925D45004424ED /* PlistBookmark */ = 220EA1ED14925D45004424ED /* PlistBookmark */; - 220EA1EF14925D45004424ED /* PBXTextBookmark */ = 220EA1EF14925D45004424ED /* PBXTextBookmark */; - 220EA2351492640C004424ED /* PBXTextBookmark */ = 220EA2351492640C004424ED /* PBXTextBookmark */; - 220EA26014926528004424ED /* PBXTextBookmark */ = 220EA26014926528004424ED /* PBXTextBookmark */; - 22A7E77F149930E60061596E /* PBXTextBookmark */ = 22A7E77F149930E60061596E /* PBXTextBookmark */; - 22A7E780149930E60061596E /* PBXTextBookmark */ = 22A7E780149930E60061596E /* PBXTextBookmark */; - 22AFFECF149798EE0079DDC5 /* PBXTextBookmark */ = 22AFFECF149798EE0079DDC5 /* PBXTextBookmark */; - 22AFFED1149798EE0079DDC5 /* PBXTextBookmark */ = 22AFFED1149798EE0079DDC5 /* PBXTextBookmark */; + 220EA1ED14925D45004424ED = 220EA1ED14925D45004424ED /* PlistBookmark */; + 220EA1EF14925D45004424ED = 220EA1EF14925D45004424ED /* PBXTextBookmark */; + 220EA26014926528004424ED = 220EA26014926528004424ED /* PBXTextBookmark */; + 223429B714AF70F500D0B406 = 223429B714AF70F500D0B406 /* PBXTextBookmark */; + 22570F6A14B11123009BC2A4 /* XCBuildMessageTextBookmark */ = 22570F6A14B11123009BC2A4 /* XCBuildMessageTextBookmark */; + 22570F6B14B11123009BC2A4 /* PBXTextBookmark */ = 22570F6B14B11123009BC2A4 /* PBXTextBookmark */; + 22570F7914B1116E009BC2A4 /* XCBuildMessageTextBookmark */ = 22570F7914B1116E009BC2A4 /* XCBuildMessageTextBookmark */; + 22570F7A14B1116E009BC2A4 /* PBXTextBookmark */ = 22570F7A14B1116E009BC2A4 /* PBXTextBookmark */; + 22570F8114B111F1009BC2A4 /* PBXTextBookmark */ = 22570F8114B111F1009BC2A4 /* PBXTextBookmark */; + 22570F8214B111F1009BC2A4 /* PBXTextBookmark */ = 22570F8214B111F1009BC2A4 /* PBXTextBookmark */; + 22570F8314B111F1009BC2A4 /* PBXTextBookmark */ = 22570F8314B111F1009BC2A4 /* PBXTextBookmark */; + 22570F8414B111F1009BC2A4 /* PBXTextBookmark */ = 22570F8414B111F1009BC2A4 /* PBXTextBookmark */; + 22570F8514B111F1009BC2A4 /* PBXTextBookmark */ = 22570F8514B111F1009BC2A4 /* PBXTextBookmark */; + 22570F8F14B11236009BC2A4 /* PBXTextBookmark */ = 22570F8F14B11236009BC2A4 /* PBXTextBookmark */; + 22570F9014B11236009BC2A4 /* PBXTextBookmark */ = 22570F9014B11236009BC2A4 /* PBXTextBookmark */; + 22570F9114B11236009BC2A4 /* PBXTextBookmark */ = 22570F9114B11236009BC2A4 /* PBXTextBookmark */; + 22570F9714B11260009BC2A4 /* PBXTextBookmark */ = 22570F9714B11260009BC2A4 /* PBXTextBookmark */; + 22570F9D14B112DF009BC2A4 /* PBXTextBookmark */ = 22570F9D14B112DF009BC2A4 /* PBXTextBookmark */; + 22570FA314B113A9009BC2A4 /* PBXTextBookmark */ = 22570FA314B113A9009BC2A4 /* PBXTextBookmark */; + 22570FA414B113A9009BC2A4 /* PBXTextBookmark */ = 22570FA414B113A9009BC2A4 /* PBXTextBookmark */; + 22570FA514B113A9009BC2A4 /* PBXTextBookmark */ = 22570FA514B113A9009BC2A4 /* PBXTextBookmark */; + 22570FAB14B11411009BC2A4 /* PBXTextBookmark */ = 22570FAB14B11411009BC2A4 /* PBXTextBookmark */; + 22570FAC14B11411009BC2A4 /* PBXTextBookmark */ = 22570FAC14B11411009BC2A4 /* PBXTextBookmark */; + 22570FAD14B11411009BC2A4 /* PBXTextBookmark */ = 22570FAD14B11411009BC2A4 /* PBXTextBookmark */; + 22570FB314B11435009BC2A4 /* PBXTextBookmark */ = 22570FB314B11435009BC2A4 /* PBXTextBookmark */; + 22570FB914B11477009BC2A4 /* PBXTextBookmark */ = 22570FB914B11477009BC2A4 /* PBXTextBookmark */; + 22570FBF14B114A4009BC2A4 /* PBXTextBookmark */ = 22570FBF14B114A4009BC2A4 /* PBXTextBookmark */; + 22570FC714B114D3009BC2A4 /* PBXTextBookmark */ = 22570FC714B114D3009BC2A4 /* PBXTextBookmark */; + 22570FDB14B130F0009BC2A4 /* PBXTextBookmark */ = 22570FDB14B130F0009BC2A4 /* PBXTextBookmark */; + 22570FDC14B130F0009BC2A4 /* XCBuildMessageTextBookmark */ = 22570FDC14B130F0009BC2A4 /* XCBuildMessageTextBookmark */; + 22570FDD14B130F0009BC2A4 /* PBXTextBookmark */ = 22570FDD14B130F0009BC2A4 /* PBXTextBookmark */; + 22570FEA14B131A0009BC2A4 /* PBXTextBookmark */ = 22570FEA14B131A0009BC2A4 /* PBXTextBookmark */; + 22570FEB14B131A0009BC2A4 /* PBXTextBookmark */ = 22570FEB14B131A0009BC2A4 /* PBXTextBookmark */; + 22570FED14B131A0009BC2A4 /* PBXTextBookmark */ = 22570FED14B131A0009BC2A4 /* PBXTextBookmark */; + 22570FEF14B131A0009BC2A4 /* PBXTextBookmark */ = 22570FEF14B131A0009BC2A4 /* PBXTextBookmark */; + 22570FF014B131A0009BC2A4 /* XCBuildMessageTextBookmark */ = 22570FF014B131A0009BC2A4 /* XCBuildMessageTextBookmark */; + 22570FF114B131A0009BC2A4 /* PBXTextBookmark */ = 22570FF114B131A0009BC2A4 /* PBXTextBookmark */; + 2257100114B13857009BC2A4 /* PBXTextBookmark */ = 2257100114B13857009BC2A4 /* PBXTextBookmark */; + 2257100214B13857009BC2A4 /* PBXTextBookmark */ = 2257100214B13857009BC2A4 /* PBXTextBookmark */; + 2257100314B13857009BC2A4 /* PBXTextBookmark */ = 2257100314B13857009BC2A4 /* PBXTextBookmark */; + 2257100414B13857009BC2A4 /* PBXTextBookmark */ = 2257100414B13857009BC2A4 /* PBXTextBookmark */; + 2257100514B13857009BC2A4 /* PBXTextBookmark */ = 2257100514B13857009BC2A4 /* PBXTextBookmark */; + 2257100B14B13899009BC2A4 /* PBXTextBookmark */ = 2257100B14B13899009BC2A4 /* PBXTextBookmark */; + 2257101114B13A0D009BC2A4 /* PBXTextBookmark */ = 2257101114B13A0D009BC2A4 /* PBXTextBookmark */; + 2257101214B13A0D009BC2A4 /* PBXTextBookmark */ = 2257101214B13A0D009BC2A4 /* PBXTextBookmark */; + 2257101314B13A0D009BC2A4 /* PBXTextBookmark */ = 2257101314B13A0D009BC2A4 /* PBXTextBookmark */; + 2257101914B13A7A009BC2A4 /* PBXTextBookmark */ = 2257101914B13A7A009BC2A4 /* PBXTextBookmark */; + 2257101F14B13B41009BC2A4 /* PBXTextBookmark */ = 2257101F14B13B41009BC2A4 /* PBXTextBookmark */; + 2257102514B13BE9009BC2A4 /* PBXTextBookmark */ = 2257102514B13BE9009BC2A4 /* PBXTextBookmark */; + 2257102B14B13C70009BC2A4 /* PBXTextBookmark */ = 2257102B14B13C70009BC2A4 /* PBXTextBookmark */; + 2257103114B13CAA009BC2A4 /* PBXTextBookmark */ = 2257103114B13CAA009BC2A4 /* PBXTextBookmark */; + 2257104214B1404F009BC2A4 /* PBXTextBookmark */ = 2257104214B1404F009BC2A4 /* PBXTextBookmark */; + 2257104414B1404F009BC2A4 /* PBXTextBookmark */ = 2257104414B1404F009BC2A4 /* PBXTextBookmark */; + 2257104514B1404F009BC2A4 /* PBXTextBookmark */ = 2257104514B1404F009BC2A4 /* PBXTextBookmark */; + 2257104614B1404F009BC2A4 /* PBXTextBookmark */ = 2257104614B1404F009BC2A4 /* PBXTextBookmark */; + 2257104714B1404F009BC2A4 /* PBXTextBookmark */ = 2257104714B1404F009BC2A4 /* PBXTextBookmark */; + 2257104814B1404F009BC2A4 /* PBXTextBookmark */ = 2257104814B1404F009BC2A4 /* PBXTextBookmark */; + 2257104E14B140C4009BC2A4 /* PBXTextBookmark */ = 2257104E14B140C4009BC2A4 /* PBXTextBookmark */; + 22A78E7514B0A80400EAEEDB = 22A78E7514B0A80400EAEEDB /* PBXTextBookmark */; + 22A78E7614B0A80400EAEEDB = 22A78E7614B0A80400EAEEDB /* PBXBookmark */; + 22A78E7714B0A80400EAEEDB = 22A78E7714B0A80400EAEEDB /* PBXTextBookmark */; + 22AFFECF149798EE0079DDC5 = 22AFFECF149798EE0079DDC5 /* PBXTextBookmark */; + 22AFFED1149798EE0079DDC5 = 22AFFED1149798EE0079DDC5 /* PBXTextBookmark */; }; sourceControlManager = 22C080CC1491244000E6B4C0 /* Source Control */; userBuildSettings = { @@ -212,25 +878,25 @@ }; E4B69E1D0A3A1BDC003C02F2 /* main.cpp */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {917, 446}}"; - sepNavSelRange = "{219, 0}"; - sepNavVisRange = "{0, 443}"; + sepNavIntBoundsRect = "{{0, 0}, {755, 311}}"; + sepNavSelRange = "{220, 0}"; + sepNavVisRange = "{0, 448}"; sepNavWindowFrame = "{{15, 4}, {976, 574}}"; }; }; E4B69E1E0A3A1BDC003C02F2 /* testApp.cpp */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {755, 5083}}"; - sepNavSelRange = "{10198, 0}"; - sepNavVisRange = "{0, 852}"; + sepNavIntBoundsRect = "{{0, 0}, {755, 1716}}"; + sepNavSelRange = "{569, 0}"; + sepNavVisRange = "{1365, 771}"; sepNavWindowFrame = "{{15, 4}, {976, 574}}"; }; }; E4B69E1F0A3A1BDC003C02F2 /* testApp.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {755, 650}}"; - sepNavSelRange = "{916, 0}"; - sepNavVisRange = "{432, 487}"; + sepNavIntBoundsRect = "{{0, 0}, {755, 767}}"; + sepNavSelRange = "{1159, 0}"; + sepNavVisRange = "{649, 627}"; }; }; E4B6FCAD0C3E899E008CF71C /* openFrameworks-Info.plist */ = { diff --git a/src/main.cpp b/src/main.cpp index 049d993..3df2e96 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -6,7 +6,7 @@ int main( ){ ofAppGlutWindow window; - ofSetupOpenGL(&window, 512,512, OF_WINDOW); // <-------- setup the GL context + ofSetupOpenGL(&window, 1024,600, OF_FULLSCREEN); // <-------- setup the GL context // this kicks off the running of my app // can be OF_WINDOW or OF_FULLSCREEN diff --git a/src/mapUtils.cpp b/src/mapUtils.cpp index 1023a40..c6a1955 100644 --- a/src/mapUtils.cpp +++ b/src/mapUtils.cpp @@ -5,10 +5,10 @@ * global utils for projection mapping * */ -#pragma once #include "ofMain.h" +//texture binding with normalised coords void bindTexture(ofBaseHasTexture &t) { ofTexture &tex = t.getTextureReference(); tex.bind(); @@ -75,5 +75,21 @@ void drawBox(float size) { glTexCoord2f(0.0f, 1.0f); glVertex3f(-size, size, -size); // Top Left Of The Texture and Quad glEnd(); } - - +void drawBoard(float x,float y,float z) { + glPushMatrix(); + glTranslated(x,y,z); + glBegin(GL_QUADS); + int cx,cz; + for (int i=0;i<8;i++) { + for (int j=0;j<4;j++) { + cx=((i%2)*16)+(j*32)-56; + cz=(i*16)-56; + glVertex3f(cx+8, 0, cz-8); + glVertex3f(cx+8, 0, cz+8); + glVertex3f(cx-8, 0, cz+8); + glVertex3f(cx-8, 0, cz-8); + } + } + glEnd(); + glPopMatrix(); +} diff --git a/src/mapUtils.h b/src/mapUtils.h index 002f90a..97af934 100644 --- a/src/mapUtils.h +++ b/src/mapUtils.h @@ -13,4 +13,5 @@ void bindTexture(ofBaseHasTexture &t); void unbindTexture(ofBaseHasTexture &t); ofPoint distort(ofPoint pt,float d); void drawBox(float size); +void drawBoard(float x,float y,float z); diff --git a/src/testApp.cpp b/src/testApp.cpp index 10dbdf4..0d42e85 100644 --- a/src/testApp.cpp +++ b/src/testApp.cpp @@ -1,11 +1,5 @@ #include "testApp.h" -GLfloat lightOnePosition[] = {40.0, 40, 100.0, 0.0}; -GLfloat lightOneColor[] = {0.99, 0.99, 0.99, 0.5}; - -GLfloat lightTwoPosition[] = {-40.0, 40, 100.0, 0.0}; -GLfloat lightTwoColor[] = {0.99, 0.99, 0.99, 0.5}; - //-------------------------------------------------------------- void testApp::setup(){ ofBackground(0,0,0); @@ -17,43 +11,27 @@ void testApp::setup(){ glShadeModel (GL_SMOOTH); /* initialize lighting */ - glLightfv (GL_LIGHT0, GL_POSITION, lightOnePosition); - glLightfv (GL_LIGHT0, GL_DIFFUSE, lightOneColor); - glEnable (GL_LIGHT0); - glLightfv (GL_LIGHT1, GL_POSITION, lightTwoPosition); - glLightfv (GL_LIGHT1, GL_DIFFUSE, lightTwoColor); - glEnable (GL_LIGHT1); glEnable (GL_LIGHTING); glColorMaterial (GL_FRONT_AND_BACK, GL_DIFFUSE); glEnable (GL_COLOR_MATERIAL); //load the bottle model - the 3ds and the texture file need to be in the same folder bottle.loadModel("bottle.3DS", 1); - board.loadModel("box.3DS", 1); bottle.setRotation(0, 180, 1, 0, 0); - board.setRotation(0, 180, 1, 0, 0); + bottle.setPosition(0, 112, 0); - //you can create as many rotations as you want - //choose which axis you want it to effect - //you can update these rotations later on - //bottleModel.setRotation(0, -90, 1, 0, 0); - //bottleModel.setRotation(1, 270, 0, 0, 1); - //bottleModel.setScale(0.9, 0.9, 0.9); - bottle.setPosition(0, 0, -50); - board.setPosition(0, 0, -50); //ofDisableArbTex(); texture.loadMovie("gradblend01.mov"); texture.play(); - mode=NOTHING; + mode=CALIBRATE; views=new viewpoint[1]; //todo: read this from xml - views[0].setup(ofGetWidth(),ofGetHeight(),0,0); - + views[0].setup(GL_LIGHT0,ofGetWidth(),ofGetHeight(),0,0); activeView=0; @@ -61,75 +39,37 @@ void testApp::setup(){ //-------------------------------------------------------------- void testApp::update(){ - board.setRotation(1, 270 + ofGetElapsedTimef() * 60, 0, 1, 0); texture.idleMovie(); } //-------------------------------------------------------------- void testApp::draw(){ - //ofPushView(); - //glMatrixMode(GL_PROJECTION); - //glLoadIdentity(); - //gluPerspective(fov,aspect,near,far); - // glTranslatef(0,0,-1000); - //glMatrixMode(GL_MODELVIEW); - // glLoadMatrixf(ofMatrix4x4::getInverseOf(getGlobalTransformMatrix()).getPtr()); - - //glEnable(GL_LIGHTING); - //ofRectangle vp=ofRectangle(0,0,ofGetWidth(),ofGetHeight()); - //camera.setFov(fov); - - - views[0].begin(); + views[0].setLight(); + views[0].begin(); ofSetColor(255, 255, 255, 255); ofFill(); - switch(mode) { case CALIBRATE: - - int cx,cz; - - glFrontFace(GL_CW); - glBegin(GL_QUADS); - for (int i=0;i<8;i++) { - for (int j=0;j<4;j++) { - cx=((i%2)*16)+(j*32)-56; - cz=(i*16)-56; - glVertex3f(cx+8, 0, cz-8); - glVertex3f(cx+8, 0, cz+8); - glVertex3f(cx-8, 0, cz+8); - glVertex3f(cx-8, 0, cz-8); - - } - } - glEnd(); - + drawBoard(0,225,0); bottle.draw(); - break; case DISPLAY: - - board.draw(); bindTexture(texture); bottle.draw(); unbindTexture(texture); break; - case NOTHING: - + case NOTHING: bindTexture(texture); - glPushMatrix(); + glPushMatrix(); drawBox(50.0f); unbindTexture(texture); - glPopMatrix(); + glPopMatrix(); break; } - views[0].end(); - ofSetHexColor(0xFFFFFF); ofDrawBitmapString("fps: "+ofToString(ofGetFrameRate(), 2), 10, 15); - } //-------------------------------------------------------------- diff --git a/src/testApp.h b/src/testApp.h index 69cfa4e..14fc09d 100644 --- a/src/testApp.h +++ b/src/testApp.h @@ -47,7 +47,6 @@ class testApp : public ofBaseApp{ void gotMessage(ofMessage msg); ofx3DModelLoader bottle; - ofx3DModelLoader board; ofVideoPlayer texture; diff --git a/src/viewpoint.cpp b/src/viewpoint.cpp index 5d61f1f..0c7fe8a 100644 --- a/src/viewpoint.cpp +++ b/src/viewpoint.cpp @@ -1,7 +1,8 @@ #include "viewpoint.h" #define DEBUG 0 -void viewpoint::setup(float w, float h, float x, float y) { +void viewpoint::setup(int ln,float w, float h, float x, float y) { + lightNum=ln; window=ofRectangle(w,h,x,y); distortFactor=0.0; renderFBO.allocate(window.width,window.height,GL_RGB); @@ -13,20 +14,37 @@ void viewpoint::setup(float w, float h, float x, float y) { far=20; camera.setParent(target); - vars=new keyVar[8]; //void set(char _keyInc,char _keyDec,float _val,float _speed,float _accel,float accelTime); vars[0].set('w','s',17.25,0.5,2.0,3.0); vars[1].set('g','d',0.0,10,3.0,3.0); - vars[2].set('r','v',0.0,10,3.0,3.0); + vars[2].set('r','v',112,10,3.0,3.0); vars[3].set('t','c',0.0,10,3.0,3.0); vars[4].set('u','n',0.0,1.0,3.0,3.0); vars[5].set('j','h',0.0,1.0,3.0,3.0); vars[6].set('o','l',1000.0,10,3.0,3.0); vars[7].set('q','a',0,0.0001,2.0,3.0); - //camera.setPosition(0,0,vars[6].getVal()); + camera.setPosition(0,0,vars[6].getVal()); +} +//-------------------------------------------------------------- +void viewpoint::setLight(){ + target.setPosition(vars[1].getVal(),vars[2].getVal(),vars[3].getVal()); + /* + target.rotate(vars[4].getInc(),1,0,0); + target.rotate(vars[5].getInc(),0,1,0); + camera.setPosition(0,0,vars[6].getVal()); + */ + + camera.orbit(vars[4].getVal(), vars[5].getVal(), vars[6].getVal(), target); + + ofVec3f lp=camera.getGlobalPosition(); + GLfloat lightPosition[] = {lp.x, lp.y, lp.z}; + GLfloat lightColour[] = {0.99, 0.99, 0.99, 0.5}; + glLightfv(lightNum, GL_POSITION, lightPosition); + glLightfv(lightNum, GL_DIFFUSE, lightColour); + glEnable(lightNum); } //-------------------------------------------------------------- void viewpoint::begin(){ @@ -38,11 +56,8 @@ void viewpoint::begin(){ camera.begin(); camera.setFov(vars[0].getVal()); - target.setPosition(vars[1].getVal(),vars[2].getVal(),vars[3].getVal()); - target.rotate(vars[4].getInc(),1,0,0); - target.rotate(vars[5].getInc(),0,1,0); - camera.setPosition(0,0,vars[6].getVal()); - + + } //-------------------------------------------------------------- diff --git a/src/viewpoint.h b/src/viewpoint.h index 1a46081..2a43a2d 100644 --- a/src/viewpoint.h +++ b/src/viewpoint.h @@ -15,11 +15,12 @@ class viewpoint { public: - void setup(float w, float h, float x, float y); + void setup(int ln,float w, float h, float x, float y); void begin(); void end(); void keyPressed(int key); void keyReleased(int key); + void setLight(); ofFbo renderFBO; @@ -29,12 +30,14 @@ class viewpoint { ofRectangle window; - double fov,aspect,near,far; ofCamera camera; ofNode target; keyVar* vars; + + int lightNum; + GLfloat lightColour[]; }; -- cgit v1.2.3