From 6489954270c6e5ee0e7968de04cd6e865cb7e8b3 Mon Sep 17 00:00:00 2001 From: Tim Redfern Date: Wed, 11 Jan 2012 10:12:47 +0000 Subject: 1st sucessful demo --- bin/data/settings.xml | 4 +- map4.xcodeproj/tim.mode1v3 | 80 ++++++++++++++-------------- map4.xcodeproj/tim.pbxuser | 127 ++++++++++++++++++++++++--------------------- src/main.cpp | 3 +- src/viewpoint.cpp | 14 ++--- 5 files changed, 117 insertions(+), 111 deletions(-) diff --git a/bin/data/settings.xml b/bin/data/settings.xml index 66d87b2..a358289 100644 --- a/bin/data/settings.xml +++ b/bin/data/settings.xml @@ -1,9 +1,9 @@ - + - + diff --git a/map4.xcodeproj/tim.mode1v3 b/map4.xcodeproj/tim.mode1v3 index 008c995..9e222b9 100644 --- a/map4.xcodeproj/tim.mode1v3 +++ b/map4.xcodeproj/tim.mode1v3 @@ -216,10 +216,10 @@ _historyCapacity 0 bookmark - 22D6C73014BC68B500A0C31F + 22B5C81E14BCBE3D00A0B0F0 history - 22D6C6DE14BC49CA00A0C31F + 22C695F914BC9440006CB636 SplitCount @@ -231,11 +231,11 @@ Geometry Frame - {{0, 20}, {976, 1157}} + {{0, 20}, {976, 477}} PBXModuleWindowStatusBarHidden2 RubberWindowFrame - 15 60 976 1198 0 0 1024 1258 + 15 60 976 518 0 0 1024 578 @@ -319,7 +319,7 @@ PBXSmartGroupTreeModuleOutlineStateVisibleRectKey - {{0, 0}, {186, 1140}} + {{0, 0}, {186, 460}} PBXTopSmartGroupGIDs @@ -331,14 +331,14 @@ GeometryConfiguration Frame - {{0, 0}, {203, 1158}} + {{0, 0}, {203, 478}} GroupTreeTableConfiguration MainColumn 186 RubberWindowFrame - 0 59 1024 1199 0 0 1024 1258 + 0 59 1024 519 0 0 1024 578 Module PBXSmartGroupTreeModule @@ -368,7 +368,7 @@ _historyCapacity 0 bookmark - 22D6C72F14BC68B500A0C31F + 22B5C81D14BCBE3D00A0B0F0 history 220EA1EF14925D45004424ED @@ -385,11 +385,11 @@ 22C9B6DE14BBB4ED0055B293 22C9B75D14BBB9290055B293 22D6C70114BC4B8C00A0C31F - 22D6C72A14BC68B500A0C31F 22D6C72B14BC68B500A0C31F 22D6C72C14BC68B500A0C31F 22D6C72D14BC68B500A0C31F - 22D6C72E14BC68B500A0C31F + 22C695F614BC9440006CB636 + 22C695F814BC9440006CB636 SplitCount @@ -401,14 +401,14 @@ GeometryConfiguration Frame - {{0, 0}, {816, 1051}} + {{0, 0}, {816, 427}} RubberWindowFrame - 0 59 1024 1199 0 0 1024 1258 + 0 59 1024 519 0 0 1024 578 Module PBXNavigatorGroup Proportion - 1051pt + 427pt ContentConfiguration @@ -421,14 +421,14 @@ GeometryConfiguration Frame - {{0, 1056}, {816, 102}} + {{0, 432}, {816, 46}} RubberWindowFrame - 0 59 1024 1199 0 0 1024 1258 + 0 59 1024 519 0 0 1024 578 Module XCDetailModule Proportion - 102pt + 46pt Proportion @@ -447,9 +447,9 @@ TableOfContents - 22D6C6E614BC4A5C00A0C31F + 22B5C80C14BCAB5400A0B0F0 1CE0B1FE06471DED0097A5F4 - 22D6C6E714BC4A5C00A0C31F + 22B5C80D14BCAB5400A0B0F0 1CE0B20306471E060097A5F4 1CE0B20506471E060097A5F4 @@ -587,16 +587,16 @@ 5 WindowOrderList - 22D6C6F414BC4A5C00A0C31F - 22D6C6F514BC4A5C00A0C31F + 22B5C81814BCAB5400A0B0F0 + 22B5C81914BCAB5400A0B0F0 + 1C78EAAD065D492600B07095 1CD10A99069EF8BA00B06720 22C080D114918C2F00E6B4C0 22D6C6E814BC4A5C00A0C31F - 1C78EAAD065D492600B07095 /Developer/Library/openFrameworks/custom/dev/map4/map4.xcodeproj WindowString - 0 59 1024 1199 0 0 1024 1258 + 0 59 1024 519 0 0 1024 578 WindowToolsV3 @@ -626,7 +626,7 @@ Frame {{0, 0}, {803, 183}} RubberWindowFrame - 139 560 803 465 0 0 1024 1258 + 139 95 803 465 0 0 1024 578 Module PBXNavigatorGroup @@ -650,7 +650,7 @@ Frame {{0, 188}, {803, 236}} RubberWindowFrame - 139 560 803 465 0 0 1024 1258 + 139 95 803 465 0 0 1024 578 Module PBXBuildResultsModule @@ -673,7 +673,7 @@ TableOfContents 22C080D114918C2F00E6B4C0 - 22D6C6EB14BC4A5C00A0C31F + 22B5C80F14BCAB5400A0B0F0 1CD0528F0623707200166675 XCMainBuildResultsModuleGUID @@ -682,7 +682,7 @@ WindowContentMinSize 486 300 WindowString - 139 560 803 465 0 0 1024 1258 + 139 95 803 465 0 0 1024 578 WindowToolGUID 22C080D114918C2F00E6B4C0 WindowToolIsVisible @@ -769,10 +769,10 @@ Frame {{0, 190}, {347, 191}} RubberWindowFrame - 165 649 694 422 0 0 1024 1258 + 165 132 694 422 0 0 1024 578 RubberWindowFrame - 165 649 694 422 0 0 1024 1258 + 165 132 694 422 0 0 1024 578 Module PBXDebugSessionModule @@ -795,18 +795,18 @@ TableOfContents 1CD10A99069EF8BA00B06720 - 22D6C6EC14BC4A5C00A0C31F + 22B5C81014BCAB5400A0B0F0 1C162984064C10D400B95A72 - 22D6C6ED14BC4A5C00A0C31F - 22D6C6EE14BC4A5C00A0C31F - 22D6C6EF14BC4A5C00A0C31F - 22D6C6F014BC4A5C00A0C31F - 22D6C6F114BC4A5C00A0C31F + 22B5C81114BCAB5400A0B0F0 + 22B5C81214BCAB5400A0B0F0 + 22B5C81314BCAB5400A0B0F0 + 22B5C81414BCAB5400A0B0F0 + 22B5C81514BCAB5400A0B0F0 ToolbarConfiguration xcode.toolbar.config.debugV3 WindowString - 165 649 694 422 0 0 1024 1258 + 165 132 694 422 0 0 1024 578 WindowToolGUID 1CD10A99069EF8BA00B06720 WindowToolIsVisible @@ -920,8 +920,6 @@ Dock - BecomeActive - ContentConfiguration PBXProjectModuleGUID @@ -934,7 +932,7 @@ Frame {{0, 0}, {1024, 503}} RubberWindowFrame - -1026 55 1024 544 -1024 0 1024 600 + 190 887 1024 544 0 0 1024 578 Module PBXDebugCLIModule @@ -957,17 +955,17 @@ TableOfContents 1C78EAAD065D492600B07095 - 22D6C6F214BC4A5C00A0C31F + 22B5C81614BCAB5400A0B0F0 1C78EAAC065D492600B07095 ToolbarConfiguration xcode.toolbar.config.consoleV3 WindowString - -1026 55 1024 544 -1024 0 1024 600 + 190 887 1024 544 0 0 1024 578 WindowToolGUID 1C78EAAD065D492600B07095 WindowToolIsVisible - + Identifier diff --git a/map4.xcodeproj/tim.pbxuser b/map4.xcodeproj/tim.pbxuser index 026e2c8..8d69b0e 100644 --- a/map4.xcodeproj/tim.pbxuser +++ b/map4.xcodeproj/tim.pbxuser @@ -93,9 +93,9 @@ }; 223429A314AF70B100D0B406 /* viewpoint.cpp */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1419, 1599}}"; - sepNavSelRange = "{38, 0}"; - sepNavVisRange = "{1937, 2479}"; + sepNavIntBoundsRect = "{{0, 0}, {1419, 1534}}"; + sepNavSelRange = "{770, 0}"; + sepNavVisRange = "{0, 1261}"; sepNavWindowFrame = "{{15, 4}, {976, 574}}"; }; }; @@ -218,6 +218,26 @@ path = /Developer/Library/openFrameworks/libs/openFrameworks/graphics/ofGraphics.cpp; sourceTree = ""; }; + 22B5C81D14BCBE3D00A0B0F0 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = E4B69E1D0A3A1BDC003C02F2 /* main.cpp */; + name = "main.cpp: 7"; + rLen = 0; + rLoc = 142; + rType = 0; + vrLen = 867; + vrLoc = 0; + }; + 22B5C81E14BCBE3D00A0B0F0 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 22C9B6AB14BBB0B90055B293 /* ofxXmlSettings.cpp */; + name = "ofxXmlSettings.cpp: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 828; + vrLoc = 557; + }; 22C080CC1491244000E6B4C0 /* Source Control */ = { isa = PBXSourceControlManager; fallbackIsa = XCSourceControlManager; @@ -232,12 +252,42 @@ isa = PBXCodeSenseManager; indexTemplatePath = ""; }; + 22C695F614BC9440006CB636 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 223429A314AF70B100D0B406 /* viewpoint.cpp */; + name = "viewpoint.cpp: 19"; + rLen = 0; + rLoc = 770; + rType = 0; + vrLen = 1261; + vrLoc = 0; + }; + 22C695F814BC9440006CB636 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = E4B69E1D0A3A1BDC003C02F2 /* main.cpp */; + name = "main.cpp: 7"; + rLen = 0; + rLoc = 142; + rType = 0; + vrLen = 867; + vrLoc = 0; + }; + 22C695F914BC9440006CB636 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 22C9B6AB14BBB0B90055B293 /* ofxXmlSettings.cpp */; + name = "ofxXmlSettings.cpp: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 828; + vrLoc = 557; + }; 22C9B6AB14BBB0B90055B293 /* ofxXmlSettings.cpp */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {917, 9282}}"; + sepNavIntBoundsRect = "{{0, 0}, {917, 9230}}"; sepNavSelRange = "{0, 0}"; - sepNavVisRange = "{557, 2291}"; - sepNavWindowFrame = "{{15, 4}, {976, 1254}}"; + sepNavVisRange = "{557, 828}"; + sepNavWindowFrame = "{{15, 4}, {976, 574}}"; }; }; 22C9B6AC14BBB0B90055B293 /* ofxXmlSettings.h */ = { @@ -284,10 +334,6 @@ vrLen = 1514; vrLoc = 0; }; - 22D6C6DE14BC49CA00A0C31F /* PBXBookmark */ = { - isa = PBXBookmark; - fRef = 22C9B6AB14BBB0B90055B293 /* ofxXmlSettings.cpp */; - }; 22D6C70114BC4B8C00A0C31F /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 22D6C70214BC4B8C00A0C31F /* basic_string.h */; @@ -300,20 +346,11 @@ }; 22D6C70214BC4B8C00A0C31F /* basic_string.h */ = { isa = PBXFileReference; + lastKnownFileType = sourcecode.c.h; name = basic_string.h; path = "/usr/include/c++/4.2.1/bits/basic_string.h"; sourceTree = ""; }; - 22D6C72A14BC68B500A0C31F /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 223429A314AF70B100D0B406 /* viewpoint.cpp */; - name = "viewpoint.cpp: 2"; - rLen = 0; - rLoc = 38; - rType = 0; - vrLen = 2479; - vrLoc = 1937; - }; 22D6C72B14BC68B500A0C31F /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 22EF433814AF89EF003C3497 /* mapUtils.cpp */; @@ -344,36 +381,6 @@ vrLen = 2041; vrLoc = 0; }; - 22D6C72E14BC68B500A0C31F /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = E4B69E1D0A3A1BDC003C02F2 /* main.cpp */; - name = "main.cpp: 20"; - rLen = 0; - rLoc = 442; - rType = 0; - vrLen = 815; - vrLoc = 0; - }; - 22D6C72F14BC68B500A0C31F /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = E4B69E1D0A3A1BDC003C02F2 /* main.cpp */; - name = "main.cpp: 28"; - rLen = 0; - rLoc = 816; - rType = 0; - vrLen = 820; - vrLoc = 0; - }; - 22D6C73014BC68B500A0C31F /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 22C9B6AB14BBB0B90055B293 /* ofxXmlSettings.cpp */; - name = "ofxXmlSettings.cpp: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 2291; - vrLoc = 557; - }; 22EF433814AF89EF003C3497 /* mapUtils.cpp */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {761, 1547}}"; @@ -425,8 +432,8 @@ PBXFileDataSource_Target_ColumnID, ); }; - PBXPerProjectTemplateStateSaveDate = 347882548; - PBXWorkspaceStateSaveDate = 347882548; + PBXPerProjectTemplateStateSaveDate = 347908937; + PBXWorkspaceStateSaveDate = 347908937; }; perUserProjectItems = { 220EA1EF14925D45004424ED /* PBXTextBookmark */ = 220EA1EF14925D45004424ED /* PBXTextBookmark */; @@ -439,18 +446,18 @@ 2282731214BA65240017A99F /* PBXTextBookmark */ = 2282731214BA65240017A99F /* PBXTextBookmark */; 22AFFECF149798EE0079DDC5 /* PBXTextBookmark */ = 22AFFECF149798EE0079DDC5 /* PBXTextBookmark */; 22AFFED1149798EE0079DDC5 /* PBXTextBookmark */ = 22AFFED1149798EE0079DDC5 /* PBXTextBookmark */; + 22B5C81D14BCBE3D00A0B0F0 /* PBXTextBookmark */ = 22B5C81D14BCBE3D00A0B0F0 /* PBXTextBookmark */; + 22B5C81E14BCBE3D00A0B0F0 /* PBXTextBookmark */ = 22B5C81E14BCBE3D00A0B0F0 /* PBXTextBookmark */; + 22C695F614BC9440006CB636 /* PBXTextBookmark */ = 22C695F614BC9440006CB636 /* PBXTextBookmark */; + 22C695F814BC9440006CB636 /* PBXTextBookmark */ = 22C695F814BC9440006CB636 /* PBXTextBookmark */; + 22C695F914BC9440006CB636 /* PBXTextBookmark */ = 22C695F914BC9440006CB636 /* PBXTextBookmark */; 22C9B6DB14BBB4ED0055B293 /* PBXTextBookmark */ = 22C9B6DB14BBB4ED0055B293 /* PBXTextBookmark */; 22C9B6DE14BBB4ED0055B293 /* PBXTextBookmark */ = 22C9B6DE14BBB4ED0055B293 /* PBXTextBookmark */; 22C9B75D14BBB9290055B293 /* PBXTextBookmark */ = 22C9B75D14BBB9290055B293 /* PBXTextBookmark */; - 22D6C6DE14BC49CA00A0C31F /* PBXBookmark */ = 22D6C6DE14BC49CA00A0C31F /* PBXBookmark */; 22D6C70114BC4B8C00A0C31F /* PBXTextBookmark */ = 22D6C70114BC4B8C00A0C31F /* PBXTextBookmark */; - 22D6C72A14BC68B500A0C31F /* PBXTextBookmark */ = 22D6C72A14BC68B500A0C31F /* PBXTextBookmark */; 22D6C72B14BC68B500A0C31F /* PBXTextBookmark */ = 22D6C72B14BC68B500A0C31F /* PBXTextBookmark */; 22D6C72C14BC68B500A0C31F /* PBXTextBookmark */ = 22D6C72C14BC68B500A0C31F /* PBXTextBookmark */; 22D6C72D14BC68B500A0C31F /* PBXTextBookmark */ = 22D6C72D14BC68B500A0C31F /* PBXTextBookmark */; - 22D6C72E14BC68B500A0C31F /* PBXTextBookmark */ = 22D6C72E14BC68B500A0C31F /* PBXTextBookmark */; - 22D6C72F14BC68B500A0C31F /* PBXTextBookmark */ = 22D6C72F14BC68B500A0C31F /* PBXTextBookmark */; - 22D6C73014BC68B500A0C31F /* PBXTextBookmark */ = 22D6C73014BC68B500A0C31F /* PBXTextBookmark */; }; sourceControlManager = 22C080CC1491244000E6B4C0 /* Source Control */; userBuildSettings = { @@ -464,9 +471,9 @@ }; E4B69E1D0A3A1BDC003C02F2 /* main.cpp */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {755, 1019}}"; - sepNavSelRange = "{816, 0}"; - sepNavVisRange = "{0, 820}"; + sepNavIntBoundsRect = "{{0, 0}, {755, 416}}"; + sepNavSelRange = "{142, 0}"; + sepNavVisRange = "{0, 867}"; sepNavWindowFrame = "{{15, 4}, {976, 574}}"; }; }; diff --git a/src/main.cpp b/src/main.cpp index 9527ea6..e9b2ef4 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -17,7 +17,8 @@ int main( ){ ofAppGlutWindow window; - ofSetupOpenGL(&window, 1600,480, OF_FULLSCREEN); // <-------- setup the GL context + ofSetupOpenGL(&window, 2048,768, OF_FULLSCREEN); // <-------- setup the GL context + //ofSetupOpenGL(&window, 800,400, OF_WINDOW); glutIgnoreKeyRepeat(1); glutSetKeyRepeat(GLUT_KEY_REPEAT_OFF); //these don't work!!! printf("key repeat ignore: %i\n",glutDeviceGet(GLUT_DEVICE_IGNORE_KEY_REPEAT)); diff --git a/src/viewpoint.cpp b/src/viewpoint.cpp index a61b235..d354edd 100644 --- a/src/viewpoint.cpp +++ b/src/viewpoint.cpp @@ -16,13 +16,13 @@ void viewpoint::setup(map&settings){ vars=new keyVar[8]; - 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[0].set('w','s',ofToFloat(settings["fov"]),0.2,1.0,3.0); + vars[1].set('g','d',ofToFloat(settings["targX"]),1,1.0,3.0); + vars[2].set('r','v',ofToFloat(settings["targY"]),1,1.0,3.0); + vars[3].set('t','c',ofToFloat(settings["targZ"]),1,1.0,3.0); + vars[4].set('u','n',ofToFloat(settings["lat"]),1,1.0,3.0); + vars[5].set('j','h',ofToFloat(settings["lng"]),1,1.0,3.0); + vars[6].set('o','l',ofToFloat(settings["dolly"]),1,1.0,3.0); vars[7].set('q','a',ofToFloat(settings["distort"]),.00001,1.0,3.0); light.enable(); -- cgit v1.2.3