From 7aa82f00186fe296ba0f818ce6cfe6cb4317bd68 Mon Sep 17 00:00:00 2001 From: Tim Redfern Date: Tue, 10 Jan 2012 00:01:13 +0000 Subject: finish xml settings --- bin/data/settings.xml | 7 +- map4.xcodeproj/project.pbxproj | 30 ++++++ map4.xcodeproj/tim.mode1v3 | 62 ++++++------ map4.xcodeproj/tim.pbxuser | 209 ++++++++++++++++++++++------------------- src/keyVar.cpp | 3 + src/keyVar.h | 1 + src/viewpoint.cpp | 36 +++++-- 7 files changed, 211 insertions(+), 137 deletions(-) diff --git a/bin/data/settings.xml b/bin/data/settings.xml index af4ec52..0c43106 100644 --- a/bin/data/settings.xml +++ b/bin/data/settings.xml @@ -1,6 +1,9 @@ - - + + + + + diff --git a/map4.xcodeproj/project.pbxproj b/map4.xcodeproj/project.pbxproj index d5cead4..97fc6c4 100644 --- a/map4.xcodeproj/project.pbxproj +++ b/map4.xcodeproj/project.pbxproj @@ -12,6 +12,10 @@ 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 */; }; + 22C9B6AD14BBB0B90055B293 /* ofxXmlSettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 22C9B6AB14BBB0B90055B293 /* ofxXmlSettings.cpp */; }; + 22C9B75114BBB6150055B293 /* tinyxml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 22C9B74D14BBB6150055B293 /* tinyxml.cpp */; }; + 22C9B75214BBB6150055B293 /* tinyxmlerror.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 22C9B74F14BBB6150055B293 /* tinyxmlerror.cpp */; }; + 22C9B75314BBB6150055B293 /* tinyxmlparser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 22C9B75014BBB6150055B293 /* tinyxmlparser.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 */; }; @@ -75,6 +79,12 @@ 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; }; + 22C9B6AB14BBB0B90055B293 /* ofxXmlSettings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ofxXmlSettings.cpp; path = Library/openFrameworks/addons/ofxXmlSettings/src/ofxXmlSettings.cpp; sourceTree = SYSTEM_DEVELOPER_DIR; }; + 22C9B6AC14BBB0B90055B293 /* ofxXmlSettings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofxXmlSettings.h; path = Library/openFrameworks/addons/ofxXmlSettings/src/ofxXmlSettings.h; sourceTree = SYSTEM_DEVELOPER_DIR; }; + 22C9B74D14BBB6150055B293 /* tinyxml.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = tinyxml.cpp; path = Library/openFrameworks/addons/ofxXmlSettings/libs/tinyxml.cpp; sourceTree = SYSTEM_DEVELOPER_DIR; }; + 22C9B74E14BBB6150055B293 /* tinyxml.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = tinyxml.h; path = Library/openFrameworks/addons/ofxXmlSettings/libs/tinyxml.h; sourceTree = SYSTEM_DEVELOPER_DIR; }; + 22C9B74F14BBB6150055B293 /* tinyxmlerror.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = tinyxmlerror.cpp; path = Library/openFrameworks/addons/ofxXmlSettings/libs/tinyxmlerror.cpp; sourceTree = SYSTEM_DEVELOPER_DIR; }; + 22C9B75014BBB6150055B293 /* tinyxmlparser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = tinyxmlparser.cpp; path = Library/openFrameworks/addons/ofxXmlSettings/libs/tinyxmlparser.cpp; 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 = ""; }; @@ -127,6 +137,12 @@ BB4B014C10F69532006C3DED /* addons */ = { isa = PBXGroup; children = ( + 22C9B74D14BBB6150055B293 /* tinyxml.cpp */, + 22C9B74E14BBB6150055B293 /* tinyxml.h */, + 22C9B74F14BBB6150055B293 /* tinyxmlerror.cpp */, + 22C9B75014BBB6150055B293 /* tinyxmlparser.cpp */, + 22C9B6AB14BBB0B90055B293 /* ofxXmlSettings.cpp */, + 22C9B6AC14BBB0B90055B293 /* ofxXmlSettings.h */, 220EA1DE14925ACB004424ED /* model3DS.cpp */, 220EA1DF14925ACB004424ED /* model3DS.h */, 220EA1E014925ACB004424ED /* texture3DS.cpp */, @@ -312,6 +328,10 @@ 223429A514AF70B100D0B406 /* keyVar.cpp in Sources */, 223429A614AF70B100D0B406 /* viewpoint.cpp in Sources */, 22EF433A14AF89EF003C3497 /* mapUtils.cpp in Sources */, + 22C9B6AD14BBB0B90055B293 /* ofxXmlSettings.cpp in Sources */, + 22C9B75114BBB6150055B293 /* tinyxml.cpp in Sources */, + 22C9B75214BBB6150055B293 /* tinyxmlerror.cpp in Sources */, + 22C9B75314BBB6150055B293 /* tinyxmlparser.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -346,10 +366,15 @@ GCC_WARN_UNINITIALIZED_AUTOS = NO; GCC_WARN_UNUSED_VALUE = NO; GCC_WARN_UNUSED_VARIABLE = NO; + HEADER_SEARCH_PATHS = ( + "$(OF_PATH)/addons/ofxXmlSettings/**", + "$(OF_CORE_HEADERS)", + ); OTHER_CPLUSPLUSFLAGS = ( "-D__MACOSX_CORE__", "-lpthread", ); + OTHER_LDFLAGS = "$(OF_CORE_LIBS)"; }; name = Debug; }; @@ -375,10 +400,15 @@ GCC_WARN_UNINITIALIZED_AUTOS = NO; GCC_WARN_UNUSED_VALUE = NO; GCC_WARN_UNUSED_VARIABLE = NO; + HEADER_SEARCH_PATHS = ( + "$(OF_PATH)/addons/ofxXmlSettings/**", + "$(OF_CORE_HEADERS)", + ); OTHER_CPLUSPLUSFLAGS = ( "-D__MACOSX_CORE__", "-lpthread", ); + OTHER_LDFLAGS = "$(OF_CORE_LIBS)"; }; name = Release; }; diff --git a/map4.xcodeproj/tim.mode1v3 b/map4.xcodeproj/tim.mode1v3 index e0536a1..4d62f21 100644 --- a/map4.xcodeproj/tim.mode1v3 +++ b/map4.xcodeproj/tim.mode1v3 @@ -265,14 +265,14 @@ E4B69B4A0A3A1720003C02F2 E4B69E1C0A3A1BDC003C02F2 + E4EEC9E9138DF44700A80321 BB4B014C10F69532006C3DED 1C37FABC05509CD000000102 PBXSmartGroupTreeModuleOutlineStateSelectionKey - 11 - 3 + 16 0 @@ -296,7 +296,7 @@ 186 RubberWindowFrame - 0 59 1024 1199 0 0 1024 1258 + 2 59 1024 1199 0 0 1024 1258 Module PBXSmartGroupTreeModule @@ -314,7 +314,7 @@ PBXProjectModuleGUID 1CE0B20306471E060097A5F4 PBXProjectModuleLabel - testApp.cpp + keyVar.cpp PBXSplitModuleInNavigatorKey Split0 @@ -322,11 +322,11 @@ PBXProjectModuleGUID 1CE0B20406471E060097A5F4 PBXProjectModuleLabel - testApp.cpp + keyVar.cpp _historyCapacity 0 bookmark - 2282731514BA65240017A99F + 22C9B6E014BBB4ED0055B293 history 220EA1EF14925D45004424ED @@ -338,14 +338,15 @@ 2226A47C14B3C58400A9FC9F 226875D314B51C4B006FAF1F 226875D414B51C4B006FAF1F - 226875D514B51C4B006FAF1F - 226875D614B51C4B006FAF1F 226875D714B51C4B006FAF1F - 2206BA6F14B5266200484E38 2206BA7014B5266200484E38 - 2206BA7114B5266200484E38 2282731214BA65240017A99F - 2282731414BA65240017A99F + 22C9B6DA14BBB4ED0055B293 + 22C9B6DB14BBB4ED0055B293 + 22C9B6DC14BBB4ED0055B293 + 22C9B6DD14BBB4ED0055B293 + 22C9B6DE14BBB4ED0055B293 + 22C9B6DF14BBB4ED0055B293 SplitCount @@ -357,14 +358,14 @@ GeometryConfiguration Frame - {{0, 0}, {816, 1105}} + {{0, 0}, {816, 1104}} RubberWindowFrame - 0 59 1024 1199 0 0 1024 1258 + 2 59 1024 1199 0 0 1024 1258 Module PBXNavigatorGroup Proportion - 1105pt + 1104pt ContentConfiguration @@ -377,14 +378,14 @@ GeometryConfiguration Frame - {{0, 1110}, {816, 48}} + {{0, 1109}, {816, 49}} RubberWindowFrame - 0 59 1024 1199 0 0 1024 1258 + 2 59 1024 1199 0 0 1024 1258 Module XCDetailModule Proportion - 48pt + 49pt Proportion @@ -403,9 +404,9 @@ TableOfContents - 2282731614BA65240017A99F + 22C9B6E114BBB4ED0055B293 1CE0B1FE06471DED0097A5F4 - 2282731714BA65240017A99F + 22C9B6E214BBB4ED0055B293 1CE0B20306471E060097A5F4 1CE0B20506471E060097A5F4 @@ -543,15 +544,12 @@ 5 WindowOrderList - 2282732014BA65240017A99F - 2282732114BA65240017A99F 1CD10A99069EF8BA00B06720 22C080D114918C2F00E6B4C0 /Developer/Library/openFrameworks/custom/dev/map4/map4.xcodeproj - 1C78EAAD065D492600B07095 WindowString - 0 59 1024 1199 0 0 1024 1258 + 2 59 1024 1199 0 0 1024 1258 WindowToolsV3 @@ -572,7 +570,7 @@ PBXProjectModuleGUID 1CD0528F0623707200166675 PBXProjectModuleLabel - + keyVar.cpp StatusBarVisibility @@ -589,6 +587,8 @@ 183pt + BecomeActive + ContentConfiguration PBXProjectModuleGUID @@ -628,7 +628,7 @@ TableOfContents 22C080D114918C2F00E6B4C0 - 2282731814BA65240017A99F + 22C9B6A314BBB08B0055B293 1CD0528F0623707200166675 XCMainBuildResultsModuleGUID @@ -750,13 +750,13 @@ TableOfContents 1CD10A99069EF8BA00B06720 - 2282731914BA65240017A99F + 22C9B6A414BBB08B0055B293 1C162984064C10D400B95A72 - 2282731A14BA65240017A99F - 2282731B14BA65240017A99F - 2282731C14BA65240017A99F - 2282731D14BA65240017A99F - 2282731E14BA65240017A99F + 22C9B6A514BBB08B0055B293 + 22C9B6A614BBB08B0055B293 + 22C9B6A714BBB08B0055B293 + 22C9B6A814BBB08B0055B293 + 22C9B6A914BBB08B0055B293 ToolbarConfiguration xcode.toolbar.config.debugV3 diff --git a/map4.xcodeproj/tim.pbxuser b/map4.xcodeproj/tim.pbxuser index c80cd8f..f9818bd 100644 --- a/map4.xcodeproj/tim.pbxuser +++ b/map4.xcodeproj/tim.pbxuser @@ -1,15 +1,5 @@ // !$*UTF8*$! { - 2206BA6F14B5266200484E38 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 223429A314AF70B100D0B406 /* viewpoint.cpp */; - name = "viewpoint.cpp: 60"; - rLen = 0; - rLoc = 1541; - rType = 0; - vrLen = 1181; - vrLoc = 1682; - }; 2206BA7014B5266200484E38 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = E4B69E1D0A3A1BDC003C02F2 /* main.cpp */; @@ -20,16 +10,6 @@ vrLen = 802; vrLoc = 0; }; - 2206BA7114B5266200484E38 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = E4B69E1F0A3A1BDC003C02F2 /* testApp.h */; - name = "testApp.h: 57"; - rLen = 8; - rLoc = 1261; - rType = 0; - vrLen = 620; - vrLoc = 671; - }; 220EA1CD14925A00004424ED /* ofx3DModelLoader.h */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {586, 351}}"; @@ -106,23 +86,24 @@ }; 223429A114AF70B100D0B406 /* keyVar.cpp */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {755, 715}}"; - sepNavSelRange = "{128, 0}"; - sepNavVisRange = "{533, 932}"; + sepNavIntBoundsRect = "{{0, 0}, {755, 1071}}"; + sepNavSelRange = "{1511, 0}"; + sepNavVisRange = "{0, 1514}"; + sepNavWindowFrame = "{{15, 4}, {976, 1254}}"; }; }; 223429A214AF70B100D0B406 /* keyVar.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {755, 429}}"; - sepNavSelRange = "{0, 0}"; - sepNavVisRange = "{0, 519}"; + sepNavIntBoundsRect = "{{0, 0}, {755, 1072}}"; + sepNavSelRange = "{392, 0}"; + sepNavVisRange = "{0, 548}"; }; }; 223429A314AF70B100D0B406 /* viewpoint.cpp */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1076, 1235}}"; - sepNavSelRange = "{1541, 0}"; - sepNavVisRange = "{1682, 1181}"; + sepNavIntBoundsRect = "{{0, 0}, {1419, 1586}}"; + sepNavSelRange = "{4222, 0}"; + sepNavVisRange = "{1729, 2669}"; sepNavWindowFrame = "{{15, 4}, {976, 574}}"; }; }; @@ -194,26 +175,6 @@ vrLen = 329; vrLoc = 0; }; - 226875D514B51C4B006FAF1F /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 223429A214AF70B100D0B406 /* keyVar.h */; - name = "keyVar.h: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 519; - vrLoc = 0; - }; - 226875D614B51C4B006FAF1F /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 223429A114AF70B100D0B406 /* keyVar.cpp */; - name = "keyVar.cpp: 5"; - rLen = 0; - rLoc = 128; - rType = 0; - vrLen = 932; - vrLoc = 533; - }; 226875D714B51C4B006FAF1F /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 223429A414AF70B100D0B406 /* viewpoint.h */; @@ -236,30 +197,11 @@ }; 2282731314BA65240017A99F /* iostream */ = { isa = PBXFileReference; + lastKnownFileType = sourcecode.cpp.h; name = iostream; path = "/Developer/SDKs/MacOSX10.6.sdk/usr/include/c++/4.2.1/iostream"; sourceTree = ""; }; - 2282731414BA65240017A99F /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = E4B69E1E0A3A1BDC003C02F2 /* testApp.cpp */; - name = "testApp.cpp: 79"; - rLen = 0; - rLoc = 2011; - rType = 0; - vrLen = 1899; - vrLoc = 1553; - }; - 2282731514BA65240017A99F /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = E4B69E1E0A3A1BDC003C02F2 /* testApp.cpp */; - name = "testApp.cpp: 109"; - rLen = 0; - rLoc = 2806; - rType = 0; - vrLen = 2098; - vrLoc = 1124; - }; 22AFFECF149798EE0079DDC5 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 22AFFED0149798EE0079DDC5 /* ofGraphics.h */; @@ -308,6 +250,81 @@ isa = PBXCodeSenseManager; indexTemplatePath = ""; }; + 22C9B6AC14BBB0B90055B293 /* ofxXmlSettings.h */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {943, 2301}}"; + sepNavSelRange = "{2722, 1}"; + sepNavVisRange = "{0, 3177}"; + }; + }; + 22C9B6DA14BBB4ED0055B293 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = E4B69E1E0A3A1BDC003C02F2 /* testApp.cpp */; + name = "testApp.cpp: 88"; + rLen = 0; + rLoc = 2285; + rType = 0; + vrLen = 2377; + vrLoc = 966; + }; + 22C9B6DB14BBB4ED0055B293 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 223429A214AF70B100D0B406 /* keyVar.h */; + name = "keyVar.h: 20"; + rLen = 0; + rLoc = 392; + rType = 0; + vrLen = 548; + vrLoc = 0; + }; + 22C9B6DC14BBB4ED0055B293 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 223429A314AF70B100D0B406 /* viewpoint.cpp */; + name = "viewpoint.cpp: 116"; + rLen = 0; + rLoc = 4222; + rType = 0; + vrLen = 2669; + vrLoc = 1729; + }; + 22C9B6DD14BBB4ED0055B293 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = E4B69E1F0A3A1BDC003C02F2 /* testApp.h */; + name = "testApp.h: 28"; + rLen = 0; + rLoc = 619; + rType = 0; + vrLen = 1415; + vrLoc = 0; + }; + 22C9B6DE14BBB4ED0055B293 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 22C9B6AC14BBB0B90055B293 /* ofxXmlSettings.h */; + name = "ofxXmlSettings.h: 73"; + rLen = 1; + rLoc = 2722; + rType = 0; + vrLen = 3177; + vrLoc = 0; + }; + 22C9B6DF14BBB4ED0055B293 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + comments = "Expected `;' before '}' token"; + fRef = 223429A114AF70B100D0B406 /* keyVar.cpp */; + rLen = 1; + rLoc = 56; + rType = 1; + }; + 22C9B6E014BBB4ED0055B293 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 223429A114AF70B100D0B406 /* keyVar.cpp */; + name = "keyVar.cpp: 56"; + rLen = 0; + rLoc = 1511; + rType = 0; + vrLen = 1514; + vrLoc = 0; + }; 22EF433814AF89EF003C3497 /* mapUtils.cpp */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {761, 1248}}"; @@ -357,28 +374,29 @@ PBXFileDataSource_Target_ColumnID, ); }; - PBXPerProjectTemplateStateSaveDate = 347757444; - PBXWorkspaceStateSaveDate = 347757444; + PBXPerProjectTemplateStateSaveDate = 347846098; + PBXWorkspaceStateSaveDate = 347846098; }; perUserProjectItems = { - 2206BA6F14B5266200484E38 /* PBXTextBookmark */ = 2206BA6F14B5266200484E38 /* PBXTextBookmark */; - 2206BA7014B5266200484E38 /* PBXTextBookmark */ = 2206BA7014B5266200484E38 /* PBXTextBookmark */; - 2206BA7114B5266200484E38 /* PBXTextBookmark */ = 2206BA7114B5266200484E38 /* PBXTextBookmark */; - 220EA1EF14925D45004424ED /* PBXTextBookmark */ = 220EA1EF14925D45004424ED /* PBXTextBookmark */; - 2226A47A14B3C58400A9FC9F /* PBXTextBookmark */ = 2226A47A14B3C58400A9FC9F /* PBXTextBookmark */; - 2226A47C14B3C58400A9FC9F /* PBXTextBookmark */ = 2226A47C14B3C58400A9FC9F /* PBXTextBookmark */; - 2257104214B1404F009BC2A4 /* PBXTextBookmark */ = 2257104214B1404F009BC2A4 /* PBXTextBookmark */; - 2257104414B1404F009BC2A4 /* PBXTextBookmark */ = 2257104414B1404F009BC2A4 /* PBXTextBookmark */; - 226875D314B51C4B006FAF1F /* PBXTextBookmark */ = 226875D314B51C4B006FAF1F /* PBXTextBookmark */; - 226875D414B51C4B006FAF1F /* PBXTextBookmark */ = 226875D414B51C4B006FAF1F /* PBXTextBookmark */; - 226875D514B51C4B006FAF1F /* PBXTextBookmark */ = 226875D514B51C4B006FAF1F /* PBXTextBookmark */; - 226875D614B51C4B006FAF1F /* PBXTextBookmark */ = 226875D614B51C4B006FAF1F /* PBXTextBookmark */; - 226875D714B51C4B006FAF1F /* PBXTextBookmark */ = 226875D714B51C4B006FAF1F /* PBXTextBookmark */; - 2282731214BA65240017A99F /* PBXTextBookmark */ = 2282731214BA65240017A99F /* PBXTextBookmark */; - 2282731414BA65240017A99F /* PBXTextBookmark */ = 2282731414BA65240017A99F /* PBXTextBookmark */; - 2282731514BA65240017A99F /* PBXTextBookmark */ = 2282731514BA65240017A99F /* PBXTextBookmark */; - 22AFFECF149798EE0079DDC5 /* PBXTextBookmark */ = 22AFFECF149798EE0079DDC5 /* PBXTextBookmark */; - 22AFFED1149798EE0079DDC5 /* PBXTextBookmark */ = 22AFFED1149798EE0079DDC5 /* PBXTextBookmark */; + 2206BA7014B5266200484E38 = 2206BA7014B5266200484E38 /* PBXTextBookmark */; + 220EA1EF14925D45004424ED = 220EA1EF14925D45004424ED /* PBXTextBookmark */; + 2226A47A14B3C58400A9FC9F = 2226A47A14B3C58400A9FC9F /* PBXTextBookmark */; + 2226A47C14B3C58400A9FC9F = 2226A47C14B3C58400A9FC9F /* PBXTextBookmark */; + 2257104214B1404F009BC2A4 = 2257104214B1404F009BC2A4 /* PBXTextBookmark */; + 2257104414B1404F009BC2A4 = 2257104414B1404F009BC2A4 /* PBXTextBookmark */; + 226875D314B51C4B006FAF1F = 226875D314B51C4B006FAF1F /* PBXTextBookmark */; + 226875D414B51C4B006FAF1F = 226875D414B51C4B006FAF1F /* PBXTextBookmark */; + 226875D714B51C4B006FAF1F = 226875D714B51C4B006FAF1F /* PBXTextBookmark */; + 2282731214BA65240017A99F = 2282731214BA65240017A99F /* PBXTextBookmark */; + 22AFFECF149798EE0079DDC5 = 22AFFECF149798EE0079DDC5 /* PBXTextBookmark */; + 22AFFED1149798EE0079DDC5 = 22AFFED1149798EE0079DDC5 /* PBXTextBookmark */; + 22C9B6DA14BBB4ED0055B293 = 22C9B6DA14BBB4ED0055B293 /* PBXTextBookmark */; + 22C9B6DB14BBB4ED0055B293 = 22C9B6DB14BBB4ED0055B293 /* PBXTextBookmark */; + 22C9B6DC14BBB4ED0055B293 = 22C9B6DC14BBB4ED0055B293 /* PBXTextBookmark */; + 22C9B6DD14BBB4ED0055B293 = 22C9B6DD14BBB4ED0055B293 /* PBXTextBookmark */; + 22C9B6DE14BBB4ED0055B293 = 22C9B6DE14BBB4ED0055B293 /* PBXTextBookmark */; + 22C9B6DF14BBB4ED0055B293 = 22C9B6DF14BBB4ED0055B293 /* PBXTextBookmark */; + 22C9B6E014BBB4ED0055B293 = 22C9B6E014BBB4ED0055B293 /* PBXTextBookmark */; }; sourceControlManager = 22C080CC1491244000E6B4C0 /* Source Control */; userBuildSettings = { @@ -400,17 +418,18 @@ }; E4B69E1E0A3A1BDC003C02F2 /* testApp.cpp */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {755, 1833}}"; - sepNavSelRange = "{2806, 0}"; - sepNavVisRange = "{1124, 2098}"; + sepNavIntBoundsRect = "{{0, 0}, {755, 2431}}"; + sepNavSelRange = "{2285, 0}"; + sepNavVisRange = "{966, 2377}"; sepNavWindowFrame = "{{15, 4}, {976, 574}}"; }; }; E4B69E1F0A3A1BDC003C02F2 /* testApp.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {755, 806}}"; - sepNavSelRange = "{1261, 8}"; - sepNavVisRange = "{671, 620}"; + sepNavIntBoundsRect = "{{0, 0}, {755, 1072}}"; + sepNavSelRange = "{619, 0}"; + sepNavVisRange = "{0, 1415}"; + sepNavWindowFrame = "{{15, 4}, {976, 1254}}"; }; }; E4B6FCAD0C3E899E008CF71C /* openFrameworks-Info.plist */ = { diff --git a/src/keyVar.cpp b/src/keyVar.cpp index 2c92896..06fd2bd 100644 --- a/src/keyVar.cpp +++ b/src/keyVar.cpp @@ -52,3 +52,6 @@ float keyVar::getInc(){ float segment = min(1.0f,(ofGetElapsedTimef()-timePressed)/accelTime); return pow(segment,accel)*speed*state; } +void keyVar::setVal(float _val){ + val=_val; +} diff --git a/src/keyVar.h b/src/keyVar.h index 2187611..c68ffab 100644 --- a/src/keyVar.h +++ b/src/keyVar.h @@ -17,6 +17,7 @@ class keyVar{ void keyReleased(char _key); float getVal(); float getInc(); + void setVal(float _val); private: char keyInc,keyDec; diff --git a/src/viewpoint.cpp b/src/viewpoint.cpp index 31d2ec7..2b7cd7a 100644 --- a/src/viewpoint.cpp +++ b/src/viewpoint.cpp @@ -16,14 +16,14 @@ void viewpoint::setup(map&settings){ vars=new keyVar[8]; - vars[0].set('w','s',17.25,0.5,1.0,3.0); - vars[1].set('g','d',0.0,10,1.0,3.0); - vars[2].set('r','v',112,10,1.0,3.0); - vars[3].set('t','c',0.0,10,1.0,3.0); - vars[4].set('u','n',0.0,10,1.0,3.0); - vars[5].set('j','h',0.0,10,1.0,3.0); - vars[6].set('o','l',1000.0,10,1.0,3.0); - vars[7].set('q','a',0,.000001,1.0,3.0); + vars[0].set('w','s',ofToFloat(settings["fov"]),0.5,1.0,3.0); + vars[1].set('g','d',ofToFloat(settings["targX"]),10,1.0,3.0); + vars[2].set('r','v',ofToFloat(settings["targY"]),10,1.0,3.0); + vars[3].set('t','c',ofToFloat(settings["targZ"]),10,1.0,3.0); + vars[4].set('u','n',ofToFloat(settings["lat"]),10,1.0,3.0); + vars[5].set('j','h',ofToFloat(settings["lng"]),10,1.0,3.0); + vars[6].set('o','l',ofToFloat(settings["dolly"]),10,1.0,3.0); + vars[7].set('q','a',0,ofToFloat(settings["distort"]),1.0,3.0); light.enable(); light.setDirectional(); @@ -33,7 +33,14 @@ double viewpoint::getSetting(const string& setting){ if (setting=="y") return window.y/ofGetHeight(); if (setting=="w") return window.width/ofGetWidth(); if (setting=="h") return window.height/ofGetHeight(); - if (setting=="distort") return distortFactor; + if (setting=="fov") return vars[0].getVal(); + if (setting=="targX") return vars[1].getVal(); + if (setting=="targY") return vars[2].getVal(); + if (setting=="targZ") return vars[3].getVal(); + if (setting=="lat") return vars[4].getVal(); + if (setting=="lng") return vars[5].getVal(); + if (setting=="dolly") return vars[7].getVal(); + if (setting=="distort") return vars[7].getVal(); } //-------------------------------------------------------------- void viewpoint::setLight(){ @@ -42,6 +49,16 @@ void viewpoint::setLight(){ camera.lookAt(target,ofVec3f(0,1,0)); light.setPosition(camera.getGlobalPosition()); } +void viewpoint::setDefaults(){ + vars[0].setVal(17.25); + vars[1].setVal(0.0); + vars[2].setVal(112.0); + vars[3].setVal(0.0); + vars[4].setVal(0.0); + vars[5].setVal(0.0); + vars[6].setVal(1000.0); + vars[7].setVal(0.0); +} //-------------------------------------------------------------- void viewpoint::begin(){ renderFBO.begin(); @@ -96,6 +113,7 @@ void viewpoint::end(){ void viewpoint::keyPressed(int key){ for (int i=0;i<8;i++) vars[i].keyPressed(key); if (DEBUG) printf("fov: %f distort: %f\n",vars[0].getVal(),vars[7].getVal()); + if (key=='!') setDefaults(); } //-------------------------------------------------------------- void viewpoint::keyReleased(int key){ -- cgit v1.2.3