summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--map4.xcodeproj/project.pbxproj6
-rw-r--r--map4.xcodeproj/tim.mode1v367
-rw-r--r--map4.xcodeproj/tim.pbxuser791
-rw-r--r--src/testApp.cpp4
-rw-r--r--src/viewpoint.cpp37
-rw-r--r--src/viewpoint.h4
6 files changed, 183 insertions, 726 deletions
diff --git a/map4.xcodeproj/project.pbxproj b/map4.xcodeproj/project.pbxproj
index c178092..d5cead4 100644
--- a/map4.xcodeproj/project.pbxproj
+++ b/map4.xcodeproj/project.pbxproj
@@ -70,7 +70,7 @@
220EA1E014925ACB004424ED /* texture3DS.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = texture3DS.cpp; path = Library/openFrameworks/addons/ofx3DModelLoader/src/3DS/texture3DS.cpp; sourceTree = SYSTEM_DEVELOPER_DIR; };
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; };
+ 220EA2581492649B004424ED /* 3dnav.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = 3dnav.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; };
@@ -191,7 +191,7 @@
E4EEC9E9138DF44700A80321 /* openFrameworks */,
BB4B014C10F69532006C3DED /* addons */,
E45BE5980E8CC70C009D7055 /* frameworks */,
- 220EA2581492649B004424ED /* 3dnavDebug.app */,
+ 220EA2581492649B004424ED /* 3dnav.app */,
);
sourceTree = "<group>";
};
@@ -239,7 +239,7 @@
);
name = 3dnav;
productName = myOFApp;
- productReference = 220EA2581492649B004424ED /* 3dnavDebug.app */;
+ productReference = 220EA2581492649B004424ED /* 3dnav.app */;
productType = "com.apple.product-type.application";
};
/* End PBXNativeTarget section */
diff --git a/map4.xcodeproj/tim.mode1v3 b/map4.xcodeproj/tim.mode1v3
index a1eedf8..375f1ce 100644
--- a/map4.xcodeproj/tim.mode1v3
+++ b/map4.xcodeproj/tim.mode1v3
@@ -271,7 +271,7 @@
<key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
<array>
<array>
- <integer>8</integer>
+ <integer>11</integer>
<integer>3</integer>
<integer>0</integer>
</array>
@@ -296,7 +296,7 @@
<real>186</real>
</array>
<key>RubberWindowFrame</key>
- <string>0 59 1024 519 0 0 1024 578 </string>
+ <string>-1 59 1024 519 0 0 1024 578 </string>
</dict>
<key>Module</key>
<string>PBXSmartGroupTreeModule</string>
@@ -314,7 +314,7 @@
<key>PBXProjectModuleGUID</key>
<string>1CE0B20306471E060097A5F4</string>
<key>PBXProjectModuleLabel</key>
- <string>viewpoint.cpp</string>
+ <string>testApp.cpp</string>
<key>PBXSplitModuleInNavigatorKey</key>
<dict>
<key>Split0</key>
@@ -322,11 +322,11 @@
<key>PBXProjectModuleGUID</key>
<string>1CE0B20406471E060097A5F4</string>
<key>PBXProjectModuleLabel</key>
- <string>viewpoint.cpp</string>
+ <string>testApp.cpp</string>
<key>_historyCapacity</key>
<integer>0</integer>
<key>bookmark</key>
- <string>2257104E14B140C4009BC2A4</string>
+ <string>2226A4AB14B3CAEB00A9FC9F</string>
<key>history</key>
<array>
<string>220EA1EF14925D45004424ED</string>
@@ -334,14 +334,16 @@
<string>22AFFED1149798EE0079DDC5</string>
<string>22570F8114B111F1009BC2A4</string>
<string>22570F8214B111F1009BC2A4</string>
- <string>22570FEF14B131A0009BC2A4</string>
- <string>2257100114B13857009BC2A4</string>
- <string>2257100214B13857009BC2A4</string>
<string>2257104214B1404F009BC2A4</string>
<string>2257104414B1404F009BC2A4</string>
- <string>2257104514B1404F009BC2A4</string>
- <string>2257104614B1404F009BC2A4</string>
- <string>2257104714B1404F009BC2A4</string>
+ <string>22578A0914B34BAC0036E99C</string>
+ <string>2226A43014B3B80600A9FC9F</string>
+ <string>2226A46F14B3BF5C00A9FC9F</string>
+ <string>2226A47914B3C58400A9FC9F</string>
+ <string>2226A47A14B3C58400A9FC9F</string>
+ <string>2226A47C14B3C58400A9FC9F</string>
+ <string>2226A4A514B3CAB700A9FC9F</string>
+ <string>2226A4A614B3CAB700A9FC9F</string>
</array>
</dict>
<key>SplitCount</key>
@@ -353,14 +355,14 @@
<key>GeometryConfiguration</key>
<dict>
<key>Frame</key>
- <string>{{0, 0}, {816, 425}}</string>
+ <string>{{0, 0}, {816, 435}}</string>
<key>RubberWindowFrame</key>
- <string>0 59 1024 519 0 0 1024 578 </string>
+ <string>-1 59 1024 519 0 0 1024 578 </string>
</dict>
<key>Module</key>
<string>PBXNavigatorGroup</string>
<key>Proportion</key>
- <string>425pt</string>
+ <string>435pt</string>
</dict>
<dict>
<key>ContentConfiguration</key>
@@ -373,14 +375,14 @@
<key>GeometryConfiguration</key>
<dict>
<key>Frame</key>
- <string>{{0, 430}, {816, 48}}</string>
+ <string>{{0, 440}, {816, 38}}</string>
<key>RubberWindowFrame</key>
- <string>0 59 1024 519 0 0 1024 578 </string>
+ <string>-1 59 1024 519 0 0 1024 578 </string>
</dict>
<key>Module</key>
<string>XCDetailModule</string>
<key>Proportion</key>
- <string>48pt</string>
+ <string>38pt</string>
</dict>
</array>
<key>Proportion</key>
@@ -399,9 +401,9 @@
</array>
<key>TableOfContents</key>
<array>
- <string>22570F8614B111F1009BC2A4</string>
+ <string>2226A3FE14B3AF2600A9FC9F</string>
<string>1CE0B1FE06471DED0097A5F4</string>
- <string>22570F8714B111F1009BC2A4</string>
+ <string>2226A3FF14B3AF2600A9FC9F</string>
<string>1CE0B20306471E060097A5F4</string>
<string>1CE0B20506471E060097A5F4</string>
</array>
@@ -539,16 +541,15 @@
<integer>5</integer>
<key>WindowOrderList</key>
<array>
- <string>2257104F14B140C4009BC2A4</string>
- <string>22570F8914B111F1009BC2A4</string>
- <string>22570F8A14B111F1009BC2A4</string>
+ <string>2226A40914B3AF2600A9FC9F</string>
+ <string>2226A40A14B3AF2600A9FC9F</string>
<string>1C78EAAD065D492600B07095</string>
<string>1CD10A99069EF8BA00B06720</string>
<string>22C080D114918C2F00E6B4C0</string>
<string>/Developer/Library/openFrameworks/custom/dev/map4/map4.xcodeproj</string>
</array>
<key>WindowString</key>
- <string>0 59 1024 519 0 0 1024 578 </string>
+ <string>-1 59 1024 519 0 0 1024 578 </string>
<key>WindowToolsV3</key>
<array>
<dict>
@@ -569,7 +570,7 @@
<key>PBXProjectModuleGUID</key>
<string>1CD0528F0623707200166675</string>
<key>PBXProjectModuleLabel</key>
- <string>viewpoint.cpp</string>
+ <string></string>
<key>StatusBarVisibility</key>
<true/>
</dict>
@@ -586,8 +587,6 @@
<string>183pt</string>
</dict>
<dict>
- <key>BecomeActive</key>
- <true/>
<key>ContentConfiguration</key>
<dict>
<key>PBXProjectModuleGUID</key>
@@ -627,7 +626,7 @@
<key>TableOfContents</key>
<array>
<string>22C080D114918C2F00E6B4C0</string>
- <string>22570F6C14B11123009BC2A4</string>
+ <string>2226A40014B3AF2600A9FC9F</string>
<string>1CD0528F0623707200166675</string>
<string>XCMainBuildResultsModuleGUID</string>
</array>
@@ -749,13 +748,13 @@
<key>TableOfContents</key>
<array>
<string>1CD10A99069EF8BA00B06720</string>
- <string>22570F6D14B11123009BC2A4</string>
+ <string>2226A40114B3AF2600A9FC9F</string>
<string>1C162984064C10D400B95A72</string>
- <string>22570F6E14B11123009BC2A4</string>
- <string>22570F6F14B11123009BC2A4</string>
- <string>22570F7014B11123009BC2A4</string>
- <string>22570F7114B11123009BC2A4</string>
- <string>22570F7214B11123009BC2A4</string>
+ <string>2226A40214B3AF2600A9FC9F</string>
+ <string>2226A40314B3AF2600A9FC9F</string>
+ <string>2226A40414B3AF2600A9FC9F</string>
+ <string>2226A40514B3AF2600A9FC9F</string>
+ <string>2226A40614B3AF2600A9FC9F</string>
</array>
<key>ToolbarConfiguration</key>
<string>xcode.toolbar.config.debugV3</string>
@@ -917,7 +916,7 @@
<key>TableOfContents</key>
<array>
<string>1C78EAAD065D492600B07095</string>
- <string>22570F7314B11123009BC2A4</string>
+ <string>2226A40714B3AF2600A9FC9F</string>
<string>1C78EAAC065D492600B07095</string>
</array>
<key>ToolbarConfiguration</key>
diff --git a/map4.xcodeproj/tim.pbxuser b/map4.xcodeproj/tim.pbxuser
index 46a1dd8..c83b976 100644
--- a/map4.xcodeproj/tim.pbxuser
+++ b/map4.xcodeproj/tim.pbxuser
@@ -1,42 +1,5 @@
// !$*UTF8*$!
{
- 2208CD3B14B1EFD3000AFF8D /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 2208CD3C14B1EFD3000AFF8D /* ofVec3f.h */;
- name = "ofVec3f.h: 1";
- rLen = 0;
- rLoc = 0;
- rType = 0;
- vrLen = 214;
- vrLoc = 0;
- };
- 2208CD3C14B1EFD3000AFF8D /* ofVec3f.h */ = {
- isa = PBXFileReference;
- name = ofVec3f.h;
- path = /Developer/Library/openFrameworks/libs/openFrameworks/math/ofVec3f.h;
- sourceTree = "<absolute>";
- };
- 2208CD3D14B1EFD3000AFF8D /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 2208CD3E14B1EFD3000AFF8D /* ofVec3f.h */;
- name = "ofVec3f.h: 1";
- rLen = 0;
- rLoc = 0;
- rType = 0;
- vrLen = 948;
- vrLoc = 6776;
- };
- 2208CD3E14B1EFD3000AFF8D /* ofVec3f.h */ = {
- isa = PBXFileReference;
- name = ofVec3f.h;
- path = /Developer/Library/openFrameworks/libs/openFrameworks/math/ofVec3f.h;
- sourceTree = "<absolute>";
- uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {705, 13169}}";
- sepNavSelRange = "{0, 0}";
- sepNavVisRange = "{6776, 948}";
- };
- };
220EA1CD14925A00004424ED /* ofx3DModelLoader.h */ = {
uiCtxt = {
sepNavIntBoundsRect = "{{0, 0}, {586, 351}}";
@@ -44,17 +7,6 @@
sepNavVisRange = "{141, 404}";
};
};
- 220EA1ED14925D45004424ED /* PlistBookmark */ = {
- isa = PlistBookmark;
- fRef = E4B6FCAD0C3E899E008CF71C /* openFrameworks-Info.plist */;
- fallbackIsa = PBXBookmark;
- isK = 0;
- kPath = (
- );
- name = "/Developer/Library/openFrameworks/custom/dev/3dnav/openFrameworks-Info.plist";
- rLen = 0;
- rLoc = 2147483647;
- };
220EA1EF14925D45004424ED /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 220EA1CD14925A00004424ED /* ofx3DModelLoader.h */;
@@ -65,13 +17,6 @@
vrLen = 542;
vrLoc = 0;
};
- 220EA23A1492640C004424ED /* testApp.cpp */ = {
- isa = PBXFileReference;
- lastKnownFileType = sourcecode.cpp.cpp;
- name = testApp.cpp;
- path = /Developer/Library/openFrameworks/custom/dev/3dnav/src/testApp.cpp;
- sourceTree = "<absolute>";
- };
220EA2591492649C004424ED /* 3dnav */ = {
isa = PBXExecutable;
activeArgIndices = (
@@ -102,330 +47,133 @@
sourceDirectories = (
);
};
- 220EA26014926528004424ED /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 220EA23A1492640C004424ED /* testApp.cpp */;
- name = "testApp.cpp: 57";
- rLen = 127;
- rLoc = 1188;
- rType = 0;
- vrLen = 562;
- vrLoc = 5436;
- };
- 223429A114AF70B100D0B406 /* keyVar.cpp */ = {
- uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {755, 1071}}";
- sepNavSelRange = "{1021, 0}";
- sepNavVisRange = "{0, 1398}";
- };
- };
- 223429A314AF70B100D0B406 /* viewpoint.cpp */ = {
- uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {755, 1599}}";
- sepNavSelRange = "{1223, 7}";
- sepNavVisRange = "{0, 2073}";
- };
- };
- 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 = 3102;
- rType = 0;
- vrLen = 589;
- vrLoc = 1133;
- };
- 22570F6A14B11123009BC2A4 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- comments = "'glTranslate' was not declared in this scope";
- fRef = 22EF433814AF89EF003C3497 /* mapUtils.cpp */;
- 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 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- comments = "'cx' was not declared in this scope";
- fRef = 22EF433814AF89EF003C3497 /* mapUtils.cpp */;
- 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 = 441;
- 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 = 1212;
- 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 */ = {
+ 2226A43014B3B80600A9FC9F /* 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 = 1212;
- rType = 0;
- vrLen = 909;
- vrLoc = 2182;
- };
- 22570F9114B11236009BC2A4 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = E4B69E1E0A3A1BDC003C02F2 /* testApp.cpp */;
- name = "testApp.cpp: 87";
- rLen = 0;
- rLoc = 1241;
- rType = 0;
- vrLen = 905;
- vrLoc = 2182;
- };
- 22570F9714B11260009BC2A4 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = E4B69E1E0A3A1BDC003C02F2 /* testApp.cpp */;
- name = "testApp.cpp: 87";
+ name = "mapUtils.cpp: 11";
rLen = 0;
- rLoc = 1241;
+ rLoc = 171;
rType = 0;
- vrLen = 906;
- vrLoc = 2182;
+ vrLen = 1475;
+ vrLoc = 2715;
};
- 22570F9D14B112DF009BC2A4 /* PBXTextBookmark */ = {
+ 2226A46F14B3BF5C00A9FC9F /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
- fRef = E4B69E1E0A3A1BDC003C02F2 /* testApp.cpp */;
- name = "testApp.cpp: 43";
+ fRef = E4B69E1F0A3A1BDC003C02F2 /* testApp.h */;
+ name = "testApp.h: 51";
rLen = 0;
- rLoc = 605;
+ rLoc = 1161;
rType = 0;
- vrLen = 954;
- vrLoc = 634;
+ vrLen = 629;
+ vrLoc = 649;
};
- 22570FA314B113A9009BC2A4 /* PBXTextBookmark */ = {
+ 2226A47914B3C58400A9FC9F /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
- fRef = E4B69E1E0A3A1BDC003C02F2 /* testApp.cpp */;
- name = "testApp.cpp: 87";
+ fRef = 223429A414AF70B100D0B406 /* viewpoint.h */;
+ name = "viewpoint.h: 43";
rLen = 0;
- rLoc = 1241;
+ rLoc = 681;
rType = 0;
- vrLen = 1016;
- vrLoc = 0;
+ vrLen = 526;
+ vrLoc = 175;
};
- 22570FA414B113A9009BC2A4 /* PBXTextBookmark */ = {
+ 2226A47A14B3C58400A9FC9F /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
- fRef = 223429A314AF70B100D0B406 /* viewpoint.cpp */;
- name = "viewpoint.cpp: 1";
+ fRef = 2226A47B14B3C58400A9FC9F /* ofLight.h */;
+ name = "ofLight.h: 1";
rLen = 0;
rLoc = 0;
rType = 0;
- vrLen = 851;
- vrLoc = 0;
+ vrLen = 613;
+ vrLoc = 1511;
};
- 22570FA514B113A9009BC2A4 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 223429A314AF70B100D0B406 /* viewpoint.cpp */;
- name = "viewpoint.cpp: 22";
- rLen = 0;
- rLoc = 547;
- rType = 0;
- vrLen = 767;
- vrLoc = 150;
+ 2226A47B14B3C58400A9FC9F /* ofLight.h */ = {
+ isa = PBXFileReference;
+ name = ofLight.h;
+ path = /Developer/Library/openFrameworks/libs/openFrameworks/gl/ofLight.h;
+ sourceTree = "<absolute>";
};
- 22570FAB14B11411009BC2A4 /* PBXTextBookmark */ = {
+ 2226A47C14B3C58400A9FC9F /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
- fRef = 223429A314AF70B100D0B406 /* viewpoint.cpp */;
- name = "viewpoint.cpp: 22";
- rLen = 0;
- rLoc = 547;
+ fRef = 22570FEE14B131A0009BC2A4 /* ofNode.h */;
+ name = "ofNode.h: 125";
+ rLen = 78;
+ rLoc = 3923;
rType = 0;
vrLen = 858;
- vrLoc = 40;
+ vrLoc = 1618;
};
- 22570FAC14B11411009BC2A4 /* PBXTextBookmark */ = {
+ 2226A4A514B3CAB700A9FC9F /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
- fRef = E4B69E1E0A3A1BDC003C02F2 /* testApp.cpp */;
- name = "testApp.cpp: 87";
+ fRef = 223429A314AF70B100D0B406 /* viewpoint.cpp */;
+ name = "viewpoint.cpp: 34";
rLen = 0;
- rLoc = 1241;
+ rLoc = 877;
rType = 0;
- vrLen = 1016;
+ vrLen = 835;
vrLoc = 0;
};
- 22570FAD14B11411009BC2A4 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = E4B69E1E0A3A1BDC003C02F2 /* testApp.cpp */;
- name = "testApp.cpp: 87";
- rLen = 0;
- rLoc = 1244;
- rType = 0;
- vrLen = 821;
- vrLoc = 2265;
- };
- 22570FB314B11435009BC2A4 /* PBXTextBookmark */ = {
+ 2226A4A614B3CAB700A9FC9F /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = E4B69E1E0A3A1BDC003C02F2 /* testApp.cpp */;
- name = "testApp.cpp: 87";
+ name = "testApp.cpp: 17";
rLen = 0;
- rLoc = 1241;
+ rLoc = 399;
rType = 0;
- vrLen = 822;
- vrLoc = 2265;
- };
- 22570FB914B11477009BC2A4 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = E4B69E1E0A3A1BDC003C02F2 /* testApp.cpp */;
- name = "testApp.cpp: 87";
- rLen = 0;
- rLoc = 1244;
- rType = 0;
- vrLen = 821;
- vrLoc = 2265;
- };
- 22570FBF14B114A4009BC2A4 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = E4B69E1E0A3A1BDC003C02F2 /* testApp.cpp */;
- name = "testApp.cpp: 87";
- rLen = 0;
- rLoc = 1244;
- rType = 0;
- vrLen = 821;
- vrLoc = 2265;
+ vrLen = 713;
+ vrLoc = 0;
};
- 22570FC714B114D3009BC2A4 /* PBXTextBookmark */ = {
+ 2226A4AB14B3CAEB00A9FC9F /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = E4B69E1E0A3A1BDC003C02F2 /* testApp.cpp */;
- name = "testApp.cpp: 87";
+ name = "testApp.cpp: 14";
rLen = 0;
- rLoc = 1243;
+ rLoc = 289;
rType = 0;
- vrLen = 821;
- vrLoc = 2265;
+ vrLen = 741;
+ vrLoc = 0;
};
- 22570FDB14B130F0009BC2A4 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 22EF433814AF89EF003C3497 /* mapUtils.cpp */;
- name = "mapUtils.cpp: 84";
- rLen = 0;
- rLoc = 3993;
- rType = 0;
- vrLen = 284;
- vrLoc = 3770;
+ 223429A114AF70B100D0B406 /* keyVar.cpp */ = {
+ uiCtxt = {
+ sepNavIntBoundsRect = "{{0, 0}, {755, 1071}}";
+ sepNavSelRange = "{1398, 0}";
+ sepNavVisRange = "{0, 1398}";
+ };
};
- 22570FDC14B130F0009BC2A4 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- comments = "Expected `;' before '{' token";
- fRef = 223429A314AF70B100D0B406 /* viewpoint.cpp */;
- rLen = 1;
- rLoc = 15;
- rType = 1;
+ 223429A314AF70B100D0B406 /* viewpoint.cpp */ = {
+ uiCtxt = {
+ sepNavIntBoundsRect = "{{0, 0}, {755, 1755}}";
+ sepNavSelRange = "{877, 0}";
+ sepNavVisRange = "{0, 835}";
+ sepNavWindowFrame = "{{15, 4}, {976, 574}}";
+ };
};
- 22570FDD14B130F0009BC2A4 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 223429A314AF70B100D0B406 /* viewpoint.cpp */;
- name = "viewpoint.cpp: 17";
- rLen = 0;
- rLoc = 329;
- rType = 0;
- vrLen = 270;
- vrLoc = 256;
+ 223429A414AF70B100D0B406 /* viewpoint.h */ = {
+ uiCtxt = {
+ sepNavIntBoundsRect = "{{0, 0}, {755, 624}}";
+ sepNavSelRange = "{681, 0}";
+ sepNavVisRange = "{175, 526}";
+ };
};
- 22570FEA14B131A0009BC2A4 /* PBXTextBookmark */ = {
+ 22570F8114B111F1009BC2A4 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
- fRef = E4B69E1E0A3A1BDC003C02F2 /* testApp.cpp */;
- name = "testApp.cpp: 67";
+ fRef = E4B69E1D0A3A1BDC003C02F2 /* main.cpp */;
+ name = "main.cpp: 9";
rLen = 0;
- rLoc = 1061;
+ rLoc = 441;
rType = 0;
- vrLen = 901;
- vrLoc = 1358;
+ vrLen = 448;
+ vrLoc = 0;
};
- 22570FEB14B131A0009BC2A4 /* PBXTextBookmark */ = {
+ 22570F8214B111F1009BC2A4 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
- fRef = 22570FEC14B131A0009BC2A4 /* ofCamera.h */;
- name = "ofCamera.h: 1";
+ fRef = 22EF433914AF89EF003C3497 /* mapUtils.h */;
+ name = "mapUtils.h: 16";
rLen = 0;
- rLoc = 0;
+ rLoc = 327;
rType = 0;
- vrLen = 1109;
- vrLoc = 857;
+ vrLen = 329;
+ vrLoc = 0;
};
22570FEC14B131A0009BC2A4 /* ofCamera.h */ = {
isa = PBXFileReference;
@@ -433,21 +181,6 @@
name = ofCamera.h;
path = /Developer/Library/openFrameworks/libs/openFrameworks/3d/ofCamera.h;
sourceTree = "<absolute>";
- uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {1573, 1071}}";
- sepNavSelRange = "{0, 0}";
- sepNavVisRange = "{0, 2136}";
- };
- };
- 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;
@@ -455,174 +188,11 @@
name = ofNode.h;
path = /Developer/Library/openFrameworks/libs/openFrameworks/3d/ofNode.h;
sourceTree = "<absolute>";
- };
- 22570FEF14B131A0009BC2A4 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 223429A414AF70B100D0B406 /* viewpoint.h */;
- name = "viewpoint.h: 41";
- rLen = 0;
- rLoc = 650;
- rType = 0;
- vrLen = 480;
- vrLoc = 175;
- };
- 22570FF014B131A0009BC2A4 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- comments = "Expected `;' before '{' token";
- fRef = 223429A314AF70B100D0B406 /* viewpoint.cpp */;
- rLen = 1;
- rLoc = 15;
- rType = 1;
- };
- 22570FF114B131A0009BC2A4 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 223429A314AF70B100D0B406 /* viewpoint.cpp */;
- name = "viewpoint.cpp: 37";
- rLen = 0;
- rLoc = 1331;
- rType = 0;
- vrLen = 941;
- vrLoc = 282;
- };
- 2257100114B13857009BC2A4 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = E4B69E1F0A3A1BDC003C02F2 /* testApp.h */;
- name = "testApp.h: 49";
- rLen = 0;
- rLoc = 1161;
- 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: 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 = 1683;
- rType = 0;
- vrLen = 791;
- vrLoc = 874;
- };
- 2257100514B13857009BC2A4 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 223429A314AF70B100D0B406 /* viewpoint.cpp */;
- name = "viewpoint.cpp: 34";
- rLen = 0;
- rLoc = 897;
- rType = 0;
- vrLen = 883;
- vrLoc = 762;
- };
- 2257100B14B13899009BC2A4 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 223429A314AF70B100D0B406 /* viewpoint.cpp */;
- name = "viewpoint.cpp: 34";
- rLen = 0;
- rLoc = 897;
- 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 = 1645;
- rType = 0;
- vrLen = 991;
- vrLoc = 487;
- };
- 2257101314B13A0D009BC2A4 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 223429A314AF70B100D0B406 /* viewpoint.cpp */;
- name = "viewpoint.cpp: 37";
- rLen = 0;
- rLoc = 1289;
- rType = 0;
- vrLen = 954;
- vrLoc = 874;
- };
- 2257101914B13A7A009BC2A4 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 223429A314AF70B100D0B406 /* viewpoint.cpp */;
- name = "viewpoint.cpp: 30";
- rLen = 0;
- rLoc = 761;
- rType = 0;
- vrLen = 832;
- vrLoc = 40;
- };
- 2257101F14B13B41009BC2A4 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 223429A314AF70B100D0B406 /* viewpoint.cpp */;
- name = "viewpoint.cpp: 36";
- rLen = 0;
- rLoc = 1289;
- rType = 0;
- vrLen = 1042;
- vrLoc = 282;
- };
- 2257102514B13BE9009BC2A4 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 223429A314AF70B100D0B406 /* viewpoint.cpp */;
- name = "viewpoint.cpp: 16";
- rLen = 0;
- rLoc = 304;
- rType = 0;
- vrLen = 858;
- vrLoc = 39;
- };
- 2257102B14B13C70009BC2A4 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 223429A314AF70B100D0B406 /* viewpoint.cpp */;
- name = "viewpoint.cpp: 16";
- rLen = 0;
- rLoc = 304;
- rType = 0;
- vrLen = 1232;
- vrLoc = 352;
- };
- 2257103114B13CAA009BC2A4 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 223429A314AF70B100D0B406 /* viewpoint.cpp */;
- name = "viewpoint.cpp: 16";
- rLen = 0;
- rLoc = 304;
- rType = 0;
- vrLen = 995;
- vrLoc = 256;
+ uiCtxt = {
+ sepNavIntBoundsRect = "{{0, 0}, {971, 2184}}";
+ sepNavSelRange = "{3923, 78}";
+ sepNavVisRange = "{1618, 858}";
+ };
};
2257104214B1404F009BC2A4 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
@@ -640,12 +210,6 @@
name = ofNode.cpp;
path = /Developer/Library/openFrameworks/libs/openFrameworks/3d/ofNode.cpp;
sourceTree = "<absolute>";
- uiCtxt = {
- sepNavFolds = "{\n c = (\n {\n l = \"float _y\";\n r = \"{8252, 12}\";\n s = 1;\n },\n {\n l = \"float _z\";\n r = \"{8266, 12}\";\n s = 1;\n }\n );\n r = \"{0, 9563}\";\n s = 0;\n}";
- sepNavIntBoundsRect = "{{0, 0}, {936, 5343}}";
- sepNavSelRange = "{7636, 0}";
- sepNavVisRange = "{4020, 2261}";
- };
};
2257104414B1404F009BC2A4 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
@@ -657,78 +221,14 @@
vrLen = 830;
vrLoc = 0;
};
- 2257104514B1404F009BC2A4 /* PBXTextBookmark */ = {
+ 22578A0914B34BAC0036E99C /* 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: 20";
- rLen = 0;
- rLoc = 569;
- rType = 0;
- vrLen = 771;
- vrLoc = 1365;
- };
- 2257104714B1404F009BC2A4 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 223429A314AF70B100D0B406 /* viewpoint.cpp */;
- name = "viewpoint.cpp: 41";
+ fRef = 223429A114AF70B100D0B406 /* keyVar.cpp */;
+ name = "keyVar.cpp: 54";
rLen = 0;
- rLoc = 1237;
+ rLoc = 1398;
rType = 0;
- vrLen = 1028;
- vrLoc = 522;
- };
- 2257104814B1404F009BC2A4 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 223429A314AF70B100D0B406 /* viewpoint.cpp */;
- name = "viewpoint.cpp: 40";
- rLen = 0;
- rLoc = 1204;
- rType = 0;
- vrLen = 912;
- vrLoc = 676;
- };
- 2257104E14B140C4009BC2A4 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 223429A314AF70B100D0B406 /* viewpoint.cpp */;
- name = "viewpoint.cpp: 40";
- rLen = 0;
- rLoc = 1169;
- rType = 0;
- 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 = 441;
- rType = 0;
- vrLen = 448;
+ vrLen = 1398;
vrLoc = 0;
};
22AFFECF149798EE0079DDC5 /* PBXTextBookmark */ = {
@@ -747,11 +247,6 @@
name = ofGraphics.h;
path = /Developer/Library/openFrameworks/libs/openFrameworks/graphics/ofGraphics.h;
sourceTree = "<absolute>";
- uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {1349, 3146}}";
- sepNavSelRange = "{2597, 66}";
- sepNavVisRange = "{4747, 2761}";
- };
};
22AFFED1149798EE0079DDC5 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
@@ -769,11 +264,6 @@
name = ofGraphics.cpp;
path = /Developer/Library/openFrameworks/libs/openFrameworks/graphics/ofGraphics.cpp;
sourceTree = "<absolute>";
- uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {985, 13611}}";
- sepNavSelRange = "{8353, 0}";
- sepNavVisRange = "{5347, 1920}";
- };
};
22C080CC1491244000E6B4C0 /* Source Control */ = {
isa = PBXSourceControlManager;
@@ -791,9 +281,9 @@
};
22EF433814AF89EF003C3497 /* mapUtils.cpp */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {755, 1508}}";
+ sepNavIntBoundsRect = "{{0, 0}, {761, 1248}}";
sepNavSelRange = "{171, 0}";
- sepNavVisRange = "{109, 848}";
+ sepNavVisRange = "{2715, 1475}";
sepNavWindowFrame = "{{15, 4}, {976, 574}}";
};
};
@@ -805,7 +295,7 @@
};
};
E4B69B4C0A3A1720003C02F2 /* Project object */ = {
- activeBuildConfigurationName = Debug;
+ activeBuildConfigurationName = Release;
activeExecutable = 220EA2591492649C004424ED /* 3dnav */;
activeTarget = E4B69B5A0A3A1756003C02F2 /* 3dnav */;
addToTargets = (
@@ -838,75 +328,26 @@
PBXFileDataSource_Target_ColumnID,
);
};
- PBXPerProjectTemplateStateSaveDate = 347194129;
- PBXWorkspaceStateSaveDate = 347194129;
+ PBXPerProjectTemplateStateSaveDate = 347320085;
+ PBXWorkspaceStateSaveDate = 347320085;
};
perUserProjectItems = {
- 2208CD3B14B1EFD3000AFF8D /* PBXTextBookmark */ = 2208CD3B14B1EFD3000AFF8D /* PBXTextBookmark */;
- 2208CD3D14B1EFD3000AFF8D /* PBXTextBookmark */ = 2208CD3D14B1EFD3000AFF8D /* PBXTextBookmark */;
- 220EA1ED14925D45004424ED = 220EA1ED14925D45004424ED /* PlistBookmark */;
- 220EA1EF14925D45004424ED = 220EA1EF14925D45004424ED /* PBXTextBookmark */;
- 220EA26014926528004424ED = 220EA26014926528004424ED /* PBXTextBookmark */;
- 223429B714AF70F500D0B406 = 223429B714AF70F500D0B406 /* PBXTextBookmark */;
- 22570F6A14B11123009BC2A4 = 22570F6A14B11123009BC2A4 /* PBXTextBookmark */;
- 22570F6B14B11123009BC2A4 = 22570F6B14B11123009BC2A4 /* PBXTextBookmark */;
- 22570F7914B1116E009BC2A4 = 22570F7914B1116E009BC2A4 /* PBXTextBookmark */;
- 22570F7A14B1116E009BC2A4 = 22570F7A14B1116E009BC2A4 /* PBXTextBookmark */;
- 22570F8114B111F1009BC2A4 = 22570F8114B111F1009BC2A4 /* PBXTextBookmark */;
- 22570F8214B111F1009BC2A4 = 22570F8214B111F1009BC2A4 /* PBXTextBookmark */;
- 22570F8314B111F1009BC2A4 = 22570F8314B111F1009BC2A4 /* PBXTextBookmark */;
- 22570F8414B111F1009BC2A4 = 22570F8414B111F1009BC2A4 /* PBXTextBookmark */;
- 22570F8514B111F1009BC2A4 = 22570F8514B111F1009BC2A4 /* PBXTextBookmark */;
- 22570F8F14B11236009BC2A4 = 22570F8F14B11236009BC2A4 /* PBXTextBookmark */;
- 22570F9014B11236009BC2A4 = 22570F9014B11236009BC2A4 /* PBXTextBookmark */;
- 22570F9114B11236009BC2A4 = 22570F9114B11236009BC2A4 /* PBXTextBookmark */;
- 22570F9714B11260009BC2A4 = 22570F9714B11260009BC2A4 /* PBXTextBookmark */;
- 22570F9D14B112DF009BC2A4 = 22570F9D14B112DF009BC2A4 /* PBXTextBookmark */;
- 22570FA314B113A9009BC2A4 = 22570FA314B113A9009BC2A4 /* PBXTextBookmark */;
- 22570FA414B113A9009BC2A4 = 22570FA414B113A9009BC2A4 /* PBXTextBookmark */;
- 22570FA514B113A9009BC2A4 = 22570FA514B113A9009BC2A4 /* PBXTextBookmark */;
- 22570FAB14B11411009BC2A4 = 22570FAB14B11411009BC2A4 /* PBXTextBookmark */;
- 22570FAC14B11411009BC2A4 = 22570FAC14B11411009BC2A4 /* PBXTextBookmark */;
- 22570FAD14B11411009BC2A4 = 22570FAD14B11411009BC2A4 /* PBXTextBookmark */;
- 22570FB314B11435009BC2A4 = 22570FB314B11435009BC2A4 /* PBXTextBookmark */;
- 22570FB914B11477009BC2A4 = 22570FB914B11477009BC2A4 /* PBXTextBookmark */;
- 22570FBF14B114A4009BC2A4 = 22570FBF14B114A4009BC2A4 /* PBXTextBookmark */;
- 22570FC714B114D3009BC2A4 = 22570FC714B114D3009BC2A4 /* PBXTextBookmark */;
- 22570FDB14B130F0009BC2A4 = 22570FDB14B130F0009BC2A4 /* PBXTextBookmark */;
- 22570FDC14B130F0009BC2A4 = 22570FDC14B130F0009BC2A4 /* PBXTextBookmark */;
- 22570FDD14B130F0009BC2A4 = 22570FDD14B130F0009BC2A4 /* PBXTextBookmark */;
- 22570FEA14B131A0009BC2A4 = 22570FEA14B131A0009BC2A4 /* PBXTextBookmark */;
- 22570FEB14B131A0009BC2A4 = 22570FEB14B131A0009BC2A4 /* PBXTextBookmark */;
- 22570FED14B131A0009BC2A4 = 22570FED14B131A0009BC2A4 /* PBXTextBookmark */;
- 22570FEF14B131A0009BC2A4 = 22570FEF14B131A0009BC2A4 /* PBXTextBookmark */;
- 22570FF014B131A0009BC2A4 = 22570FF014B131A0009BC2A4 /* PBXTextBookmark */;
- 22570FF114B131A0009BC2A4 = 22570FF114B131A0009BC2A4 /* PBXTextBookmark */;
- 2257100114B13857009BC2A4 = 2257100114B13857009BC2A4 /* PBXTextBookmark */;
- 2257100214B13857009BC2A4 = 2257100214B13857009BC2A4 /* PBXTextBookmark */;
- 2257100314B13857009BC2A4 = 2257100314B13857009BC2A4 /* PBXTextBookmark */;
- 2257100414B13857009BC2A4 = 2257100414B13857009BC2A4 /* PBXTextBookmark */;
- 2257100514B13857009BC2A4 = 2257100514B13857009BC2A4 /* PBXTextBookmark */;
- 2257100B14B13899009BC2A4 = 2257100B14B13899009BC2A4 /* PBXTextBookmark */;
- 2257101114B13A0D009BC2A4 = 2257101114B13A0D009BC2A4 /* PBXTextBookmark */;
- 2257101214B13A0D009BC2A4 = 2257101214B13A0D009BC2A4 /* PBXTextBookmark */;
- 2257101314B13A0D009BC2A4 = 2257101314B13A0D009BC2A4 /* PBXTextBookmark */;
- 2257101914B13A7A009BC2A4 = 2257101914B13A7A009BC2A4 /* PBXTextBookmark */;
- 2257101F14B13B41009BC2A4 = 2257101F14B13B41009BC2A4 /* PBXTextBookmark */;
- 2257102514B13BE9009BC2A4 = 2257102514B13BE9009BC2A4 /* PBXTextBookmark */;
- 2257102B14B13C70009BC2A4 = 2257102B14B13C70009BC2A4 /* PBXTextBookmark */;
- 2257103114B13CAA009BC2A4 = 2257103114B13CAA009BC2A4 /* PBXTextBookmark */;
- 2257104214B1404F009BC2A4 = 2257104214B1404F009BC2A4 /* PBXTextBookmark */;
- 2257104414B1404F009BC2A4 = 2257104414B1404F009BC2A4 /* PBXTextBookmark */;
- 2257104514B1404F009BC2A4 = 2257104514B1404F009BC2A4 /* PBXTextBookmark */;
- 2257104614B1404F009BC2A4 = 2257104614B1404F009BC2A4 /* PBXTextBookmark */;
- 2257104714B1404F009BC2A4 = 2257104714B1404F009BC2A4 /* PBXTextBookmark */;
- 2257104814B1404F009BC2A4 = 2257104814B1404F009BC2A4 /* PBXTextBookmark */;
- 2257104E14B140C4009BC2A4 = 2257104E14B140C4009BC2A4 /* PBXTextBookmark */;
- 22A78E7514B0A80400EAEEDB = 22A78E7514B0A80400EAEEDB /* PBXTextBookmark */;
- 22A78E7614B0A80400EAEEDB = 22A78E7614B0A80400EAEEDB /* PBXBookmark */;
- 22A78E7714B0A80400EAEEDB = 22A78E7714B0A80400EAEEDB /* PBXTextBookmark */;
- 22AFFECF149798EE0079DDC5 = 22AFFECF149798EE0079DDC5 /* PBXTextBookmark */;
- 22AFFED1149798EE0079DDC5 = 22AFFED1149798EE0079DDC5 /* PBXTextBookmark */;
+ 220EA1EF14925D45004424ED /* PBXTextBookmark */ = 220EA1EF14925D45004424ED /* PBXTextBookmark */;
+ 2226A43014B3B80600A9FC9F /* PBXTextBookmark */ = 2226A43014B3B80600A9FC9F /* PBXTextBookmark */;
+ 2226A46F14B3BF5C00A9FC9F /* PBXTextBookmark */ = 2226A46F14B3BF5C00A9FC9F /* PBXTextBookmark */;
+ 2226A47914B3C58400A9FC9F /* PBXTextBookmark */ = 2226A47914B3C58400A9FC9F /* PBXTextBookmark */;
+ 2226A47A14B3C58400A9FC9F /* PBXTextBookmark */ = 2226A47A14B3C58400A9FC9F /* PBXTextBookmark */;
+ 2226A47C14B3C58400A9FC9F /* PBXTextBookmark */ = 2226A47C14B3C58400A9FC9F /* PBXTextBookmark */;
+ 2226A4A514B3CAB700A9FC9F /* PBXTextBookmark */ = 2226A4A514B3CAB700A9FC9F /* PBXTextBookmark */;
+ 2226A4A614B3CAB700A9FC9F /* PBXTextBookmark */ = 2226A4A614B3CAB700A9FC9F /* PBXTextBookmark */;
+ 2226A4AB14B3CAEB00A9FC9F /* PBXTextBookmark */ = 2226A4AB14B3CAEB00A9FC9F /* PBXTextBookmark */;
+ 22570F8114B111F1009BC2A4 /* PBXTextBookmark */ = 22570F8114B111F1009BC2A4 /* PBXTextBookmark */;
+ 22570F8214B111F1009BC2A4 /* PBXTextBookmark */ = 22570F8214B111F1009BC2A4 /* PBXTextBookmark */;
+ 2257104214B1404F009BC2A4 /* PBXTextBookmark */ = 2257104214B1404F009BC2A4 /* PBXTextBookmark */;
+ 2257104414B1404F009BC2A4 /* PBXTextBookmark */ = 2257104414B1404F009BC2A4 /* PBXTextBookmark */;
+ 22578A0914B34BAC0036E99C /* PBXTextBookmark */ = 22578A0914B34BAC0036E99C /* PBXTextBookmark */;
+ 22AFFECF149798EE0079DDC5 /* PBXTextBookmark */ = 22AFFECF149798EE0079DDC5 /* PBXTextBookmark */;
+ 22AFFED1149798EE0079DDC5 /* PBXTextBookmark */ = 22AFFED1149798EE0079DDC5 /* PBXTextBookmark */;
};
sourceControlManager = 22C080CC1491244000E6B4C0 /* Source Control */;
userBuildSettings = {
@@ -928,17 +369,17 @@
};
E4B69E1E0A3A1BDC003C02F2 /* testApp.cpp */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {755, 1690}}";
- sepNavSelRange = "{741, 0}";
- sepNavVisRange = "{0, 2024}";
+ sepNavIntBoundsRect = "{{0, 0}, {755, 1742}}";
+ sepNavSelRange = "{289, 0}";
+ sepNavVisRange = "{0, 741}";
sepNavWindowFrame = "{{15, 4}, {976, 574}}";
};
};
E4B69E1F0A3A1BDC003C02F2 /* testApp.h */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {755, 1071}}";
- sepNavSelRange = "{695, 0}";
- sepNavVisRange = "{0, 1278}";
+ sepNavIntBoundsRect = "{{0, 0}, {755, 793}}";
+ sepNavSelRange = "{1161, 0}";
+ sepNavVisRange = "{649, 629}";
};
};
E4B6FCAD0C3E899E008CF71C /* openFrameworks-Info.plist */ = {
diff --git a/src/testApp.cpp b/src/testApp.cpp
index 089e677..e9ae5ee 100644
--- a/src/testApp.cpp
+++ b/src/testApp.cpp
@@ -10,8 +10,8 @@ void testApp::setup(){
glEnable (GL_DEPTH_TEST);
glShadeModel (GL_SMOOTH);
- /* initialize lighting */
- glEnable (GL_LIGHTING);
+ // initialize lighting
+ //glEnable (GL_LIGHTING);
glColorMaterial (GL_FRONT_AND_BACK, GL_DIFFUSE);
glEnable (GL_COLOR_MATERIAL);
diff --git a/src/viewpoint.cpp b/src/viewpoint.cpp
index 39e8d32..62d5f64 100644
--- a/src/viewpoint.cpp
+++ b/src/viewpoint.cpp
@@ -17,19 +17,26 @@ void viewpoint::setup(int ln,float w, float h, float x, float y) {
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,100,3.0,3.0);
- vars[2].set('r','v',112,100,3.0,3.0);
- vars[3].set('t','c',0.0,100,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,200,3.0,3.0);
- vars[7].set('q','a',0,0.0001,2.0,3.0);
+ 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,1,1.0,3.0);
//camera.setPosition(0,0,vars[6].getVal());
+
+ getLightPosition=new GLfloat[4];
+
+ light.enable();
+ light.setPointLight();
}
//--------------------------------------------------------------
void viewpoint::setLight(){
+ //glLoadIdentity();
+ //glPushMatrix();
target.setPosition(vars[1].getVal(),vars[2].getVal(),vars[3].getVal());
/*
target.rotate(vars[4].getInc(),1,0,0);
@@ -39,12 +46,18 @@ void viewpoint::setLight(){
camera.orbit(vars[5].getVal(), vars[4].getVal(), vars[6].getVal(), target);
camera.lookAt(target,ofVec3f(0,1,0));
- ofVec3f lp=camera.getGlobalPosition();
+ //glPopMatrix();
+ //ofVec3f lp=camera.getGlobalPosition();
+ light.setPosition(camera.getGlobalPosition());
+ /*
GLfloat lightPosition[] = {lp.x, lp.y, lp.z,1};
GLfloat lightColour[] = {0.99, 0.99, 0.99, 0.5};
+
glLightfv(lightNum, GL_POSITION, lightPosition);
glLightfv(lightNum, GL_DIFFUSE, lightColour);
glEnable(lightNum);
+ glGetLightfv(lightNum,GL_POSITION, getLightPosition);
+ */
}
//--------------------------------------------------------------
void viewpoint::begin(){
@@ -108,9 +121,9 @@ void viewpoint::end(){
ofPopMatrix();
- //ofSetHexColor(0xFFFFFF);
- //ofDrawBitmapString("camera: "+ofToString(camera.getX(), 2)+","+ofToString(camera.getY(), 2)+","+ofToString(camera.getZ(), 2), 10, ofGetHeight()-30);
- //ofDrawBitmapString("light: "+ofToString(camera.getX(), 2)+","+ofToString(camera.getY(), 2)+","+ofToString(camera.getZ(), 2), 10, ofGetHeight()-30);
+ ofSetHexColor(0xFFFFFF);
+ ofDrawBitmapString("camera: "+ofToString(camera.getX(), 2)+","+ofToString(camera.getY(), 2)+","+ofToString(camera.getZ(), 2), 10, ofGetHeight()-30);
+ ofDrawBitmapString("light: "+ofToString(light.getX(), 2)+","+ofToString(light.getY(), 2)+","+ofToString(light.getZ(), 2), 10, ofGetHeight()-18);
}
//--------------------------------------------------------------
diff --git a/src/viewpoint.h b/src/viewpoint.h
index 2a43a2d..20da42d 100644
--- a/src/viewpoint.h
+++ b/src/viewpoint.h
@@ -39,5 +39,9 @@ class viewpoint {
int lightNum;
GLfloat lightColour[];
+
+ GLfloat* getLightPosition;
+
+ ofLight light;
};
generated by cgit v1.2.3 (git 2.39.1) at 2025-12-06 10:51:09 +0000