summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--map4.xcodeproj/tim.pbxuser290
-rw-r--r--src/keyVar.cpp8
-rw-r--r--src/main.cpp21
-rw-r--r--src/testApp.cpp1
-rw-r--r--src/testApp.h2
-rw-r--r--src/viewpoint.cpp22
6 files changed, 205 insertions, 139 deletions
diff --git a/map4.xcodeproj/tim.pbxuser b/map4.xcodeproj/tim.pbxuser
index c3c370d..46a1dd8 100644
--- a/map4.xcodeproj/tim.pbxuser
+++ b/map4.xcodeproj/tim.pbxuser
@@ -1,5 +1,42 @@
// !$*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}}";
@@ -34,11 +71,6 @@
name = testApp.cpp;
path = /Developer/Library/openFrameworks/custom/dev/3dnav/src/testApp.cpp;
sourceTree = "<absolute>";
- uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {755, 6500}}";
- sepNavSelRange = "{1188, 127}";
- sepNavVisRange = "{1547, 647}";
- };
};
220EA2591492649C004424ED /* 3dnav */ = {
isa = PBXExecutable;
@@ -82,16 +114,16 @@
};
223429A114AF70B100D0B406 /* keyVar.cpp */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {755, 702}}";
- sepNavSelRange = "{1243, 0}";
- sepNavVisRange = "{466, 820}";
+ sepNavIntBoundsRect = "{{0, 0}, {755, 1071}}";
+ sepNavSelRange = "{1021, 0}";
+ sepNavVisRange = "{0, 1398}";
};
};
223429A314AF70B100D0B406 /* viewpoint.cpp */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {742, 1599}}";
- sepNavSelRange = "{327, 0}";
- sepNavVisRange = "{250, 325}";
+ sepNavIntBoundsRect = "{{0, 0}, {755, 1599}}";
+ sepNavSelRange = "{1223, 7}";
+ sepNavVisRange = "{0, 2073}";
};
};
223429A414AF70B100D0B406 /* viewpoint.h */ = {
@@ -106,16 +138,15 @@
fRef = E4B69E1E0A3A1BDC003C02F2 /* testApp.cpp */;
name = "testApp.cpp: 192";
rLen = 0;
- rLoc = 3100;
+ rLoc = 3102;
rType = 0;
vrLen = 589;
vrLoc = 1133;
};
- 22570F6A14B11123009BC2A4 /* XCBuildMessageTextBookmark */ = {
+ 22570F6A14B11123009BC2A4 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
comments = "'glTranslate' was not declared in this scope";
fRef = 22EF433814AF89EF003C3497 /* mapUtils.cpp */;
- fallbackIsa = XCBuildMessageTextBookmark;
rLen = 1;
rLoc = 79;
rType = 1;
@@ -130,11 +161,10 @@
vrLen = 271;
vrLoc = 3840;
};
- 22570F7914B1116E009BC2A4 /* XCBuildMessageTextBookmark */ = {
+ 22570F7914B1116E009BC2A4 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
comments = "'cx' was not declared in this scope";
fRef = 22EF433814AF89EF003C3497 /* mapUtils.cpp */;
- fallbackIsa = XCBuildMessageTextBookmark;
rLen = 1;
rLoc = 84;
rType = 1;
@@ -154,7 +184,7 @@
fRef = E4B69E1D0A3A1BDC003C02F2 /* main.cpp */;
name = "main.cpp: 9";
rLen = 0;
- rLoc = 220;
+ rLoc = 441;
rType = 0;
vrLen = 448;
vrLoc = 0;
@@ -174,7 +204,7 @@
fRef = E4B69E1E0A3A1BDC003C02F2 /* testApp.cpp */;
name = "testApp.cpp: 86";
rLen = 0;
- rLoc = 1210;
+ rLoc = 1212;
rType = 0;
vrLen = 824;
vrLoc = 2267;
@@ -214,7 +244,7 @@
fRef = E4B69E1E0A3A1BDC003C02F2 /* testApp.cpp */;
name = "testApp.cpp: 86";
rLen = 0;
- rLoc = 1210;
+ rLoc = 1212;
rType = 0;
vrLen = 909;
vrLoc = 2182;
@@ -224,7 +254,7 @@
fRef = E4B69E1E0A3A1BDC003C02F2 /* testApp.cpp */;
name = "testApp.cpp: 87";
rLen = 0;
- rLoc = 1239;
+ rLoc = 1241;
rType = 0;
vrLen = 905;
vrLoc = 2182;
@@ -234,7 +264,7 @@
fRef = E4B69E1E0A3A1BDC003C02F2 /* testApp.cpp */;
name = "testApp.cpp: 87";
rLen = 0;
- rLoc = 1239;
+ rLoc = 1241;
rType = 0;
vrLen = 906;
vrLoc = 2182;
@@ -254,7 +284,7 @@
fRef = E4B69E1E0A3A1BDC003C02F2 /* testApp.cpp */;
name = "testApp.cpp: 87";
rLen = 0;
- rLoc = 1239;
+ rLoc = 1241;
rType = 0;
vrLen = 1016;
vrLoc = 0;
@@ -274,7 +304,7 @@
fRef = 223429A314AF70B100D0B406 /* viewpoint.cpp */;
name = "viewpoint.cpp: 22";
rLen = 0;
- rLoc = 546;
+ rLoc = 547;
rType = 0;
vrLen = 767;
vrLoc = 150;
@@ -284,7 +314,7 @@
fRef = 223429A314AF70B100D0B406 /* viewpoint.cpp */;
name = "viewpoint.cpp: 22";
rLen = 0;
- rLoc = 546;
+ rLoc = 547;
rType = 0;
vrLen = 858;
vrLoc = 40;
@@ -294,7 +324,7 @@
fRef = E4B69E1E0A3A1BDC003C02F2 /* testApp.cpp */;
name = "testApp.cpp: 87";
rLen = 0;
- rLoc = 1239;
+ rLoc = 1241;
rType = 0;
vrLen = 1016;
vrLoc = 0;
@@ -304,7 +334,7 @@
fRef = E4B69E1E0A3A1BDC003C02F2 /* testApp.cpp */;
name = "testApp.cpp: 87";
rLen = 0;
- rLoc = 1242;
+ rLoc = 1244;
rType = 0;
vrLen = 821;
vrLoc = 2265;
@@ -314,7 +344,7 @@
fRef = E4B69E1E0A3A1BDC003C02F2 /* testApp.cpp */;
name = "testApp.cpp: 87";
rLen = 0;
- rLoc = 1239;
+ rLoc = 1241;
rType = 0;
vrLen = 822;
vrLoc = 2265;
@@ -324,7 +354,7 @@
fRef = E4B69E1E0A3A1BDC003C02F2 /* testApp.cpp */;
name = "testApp.cpp: 87";
rLen = 0;
- rLoc = 1242;
+ rLoc = 1244;
rType = 0;
vrLen = 821;
vrLoc = 2265;
@@ -334,7 +364,7 @@
fRef = E4B69E1E0A3A1BDC003C02F2 /* testApp.cpp */;
name = "testApp.cpp: 87";
rLen = 0;
- rLoc = 1242;
+ rLoc = 1244;
rType = 0;
vrLen = 821;
vrLoc = 2265;
@@ -344,7 +374,7 @@
fRef = E4B69E1E0A3A1BDC003C02F2 /* testApp.cpp */;
name = "testApp.cpp: 87";
rLen = 0;
- rLoc = 1241;
+ rLoc = 1243;
rType = 0;
vrLen = 821;
vrLoc = 2265;
@@ -359,11 +389,10 @@
vrLen = 284;
vrLoc = 3770;
};
- 22570FDC14B130F0009BC2A4 /* XCBuildMessageTextBookmark */ = {
+ 22570FDC14B130F0009BC2A4 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
comments = "Expected `;' before '{' token";
fRef = 223429A314AF70B100D0B406 /* viewpoint.cpp */;
- fallbackIsa = XCBuildMessageTextBookmark;
rLen = 1;
rLoc = 15;
rType = 1;
@@ -373,7 +402,7 @@
fRef = 223429A314AF70B100D0B406 /* viewpoint.cpp */;
name = "viewpoint.cpp: 17";
rLen = 0;
- rLoc = 327;
+ rLoc = 329;
rType = 0;
vrLen = 270;
vrLoc = 256;
@@ -383,7 +412,7 @@
fRef = E4B69E1E0A3A1BDC003C02F2 /* testApp.cpp */;
name = "testApp.cpp: 67";
rLen = 0;
- rLoc = 1059;
+ rLoc = 1061;
rType = 0;
vrLen = 901;
vrLoc = 1358;
@@ -405,9 +434,9 @@
path = /Developer/Library/openFrameworks/libs/openFrameworks/3d/ofCamera.h;
sourceTree = "<absolute>";
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {1573, 988}}";
+ sepNavIntBoundsRect = "{{0, 0}, {1573, 1071}}";
sepNavSelRange = "{0, 0}";
- sepNavVisRange = "{0, 830}";
+ sepNavVisRange = "{0, 2136}";
};
};
22570FED14B131A0009BC2A4 /* PBXTextBookmark */ = {
@@ -426,11 +455,6 @@
name = ofNode.h;
path = /Developer/Library/openFrameworks/libs/openFrameworks/3d/ofNode.h;
sourceTree = "<absolute>";
- uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {971, 2249}}";
- sepNavSelRange = "{3923, 78}";
- sepNavVisRange = "{3279, 1296}";
- };
};
22570FEF14B131A0009BC2A4 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
@@ -442,11 +466,10 @@
vrLen = 480;
vrLoc = 175;
};
- 22570FF014B131A0009BC2A4 /* XCBuildMessageTextBookmark */ = {
+ 22570FF014B131A0009BC2A4 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
comments = "Expected `;' before '{' token";
fRef = 223429A314AF70B100D0B406 /* viewpoint.cpp */;
- fallbackIsa = XCBuildMessageTextBookmark;
rLen = 1;
rLoc = 15;
rType = 1;
@@ -456,7 +479,7 @@
fRef = 223429A314AF70B100D0B406 /* viewpoint.cpp */;
name = "viewpoint.cpp: 37";
rLen = 0;
- rLoc = 1292;
+ rLoc = 1331;
rType = 0;
vrLen = 941;
vrLoc = 282;
@@ -466,7 +489,7 @@
fRef = E4B69E1F0A3A1BDC003C02F2 /* testApp.h */;
name = "testApp.h: 49";
rLen = 0;
- rLoc = 1159;
+ rLoc = 1161;
rType = 0;
vrLen = 627;
vrLoc = 649;
@@ -496,7 +519,7 @@
fRef = 223429A314AF70B100D0B406 /* viewpoint.cpp */;
name = "viewpoint.cpp: 58";
rLen = 0;
- rLoc = 1644;
+ rLoc = 1683;
rType = 0;
vrLen = 791;
vrLoc = 874;
@@ -506,7 +529,7 @@
fRef = 223429A314AF70B100D0B406 /* viewpoint.cpp */;
name = "viewpoint.cpp: 34";
rLen = 0;
- rLoc = 896;
+ rLoc = 897;
rType = 0;
vrLen = 883;
vrLoc = 762;
@@ -516,7 +539,7 @@
fRef = 223429A314AF70B100D0B406 /* viewpoint.cpp */;
name = "viewpoint.cpp: 34";
rLen = 0;
- rLoc = 896;
+ rLoc = 897;
rType = 0;
vrLen = 951;
vrLoc = 762;
@@ -536,7 +559,7 @@
fRef = 223429A314AF70B100D0B406 /* viewpoint.cpp */;
name = "viewpoint.cpp: 52";
rLen = 0;
- rLoc = 1606;
+ rLoc = 1645;
rType = 0;
vrLen = 991;
vrLoc = 487;
@@ -546,7 +569,7 @@
fRef = 223429A314AF70B100D0B406 /* viewpoint.cpp */;
name = "viewpoint.cpp: 37";
rLen = 0;
- rLoc = 1250;
+ rLoc = 1289;
rType = 0;
vrLen = 954;
vrLoc = 874;
@@ -556,7 +579,7 @@
fRef = 223429A314AF70B100D0B406 /* viewpoint.cpp */;
name = "viewpoint.cpp: 30";
rLen = 0;
- rLoc = 760;
+ rLoc = 761;
rType = 0;
vrLen = 832;
vrLoc = 40;
@@ -566,7 +589,7 @@
fRef = 223429A314AF70B100D0B406 /* viewpoint.cpp */;
name = "viewpoint.cpp: 36";
rLen = 0;
- rLoc = 1250;
+ rLoc = 1289;
rType = 0;
vrLen = 1042;
vrLoc = 282;
@@ -576,7 +599,7 @@
fRef = 223429A314AF70B100D0B406 /* viewpoint.cpp */;
name = "viewpoint.cpp: 16";
rLen = 0;
- rLoc = 302;
+ rLoc = 304;
rType = 0;
vrLen = 858;
vrLoc = 39;
@@ -586,7 +609,7 @@
fRef = 223429A314AF70B100D0B406 /* viewpoint.cpp */;
name = "viewpoint.cpp: 16";
rLen = 0;
- rLoc = 302;
+ rLoc = 304;
rType = 0;
vrLen = 1232;
vrLoc = 352;
@@ -596,7 +619,7 @@
fRef = 223429A314AF70B100D0B406 /* viewpoint.cpp */;
name = "viewpoint.cpp: 16";
rLen = 0;
- rLoc = 302;
+ rLoc = 304;
rType = 0;
vrLen = 995;
vrLoc = 256;
@@ -613,9 +636,16 @@
};
2257104314B1404F009BC2A4 /* ofNode.cpp */ = {
isa = PBXFileReference;
+ lastKnownFileType = sourcecode.cpp.cpp;
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;
@@ -652,7 +682,7 @@
fRef = 223429A314AF70B100D0B406 /* viewpoint.cpp */;
name = "viewpoint.cpp: 41";
rLen = 0;
- rLoc = 1198;
+ rLoc = 1237;
rType = 0;
vrLen = 1028;
vrLoc = 522;
@@ -662,7 +692,7 @@
fRef = 223429A314AF70B100D0B406 /* viewpoint.cpp */;
name = "viewpoint.cpp: 40";
rLen = 0;
- rLoc = 1180;
+ rLoc = 1204;
rType = 0;
vrLen = 912;
vrLoc = 676;
@@ -672,7 +702,7 @@
fRef = 223429A314AF70B100D0B406 /* viewpoint.cpp */;
name = "viewpoint.cpp: 40";
rLen = 0;
- rLoc = 1168;
+ rLoc = 1169;
rType = 0;
vrLen = 912;
vrLoc = 676;
@@ -696,7 +726,7 @@
fRef = E4B69E1D0A3A1BDC003C02F2 /* main.cpp */;
name = "main.cpp: 9";
rLen = 0;
- rLoc = 220;
+ rLoc = 441;
rType = 0;
vrLen = 448;
vrLoc = 0;
@@ -717,6 +747,11 @@
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;
@@ -734,6 +769,11 @@
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;
@@ -798,68 +838,70 @@
PBXFileDataSource_Target_ColumnID,
);
};
- PBXPerProjectTemplateStateSaveDate = 347147300;
- PBXWorkspaceStateSaveDate = 347147300;
+ PBXPerProjectTemplateStateSaveDate = 347194129;
+ PBXWorkspaceStateSaveDate = 347194129;
};
perUserProjectItems = {
+ 2208CD3B14B1EFD3000AFF8D /* PBXTextBookmark */ = 2208CD3B14B1EFD3000AFF8D /* PBXTextBookmark */;
+ 2208CD3D14B1EFD3000AFF8D /* PBXTextBookmark */ = 2208CD3D14B1EFD3000AFF8D /* 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 */;
+ 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 */;
@@ -878,25 +920,25 @@
};
E4B69E1D0A3A1BDC003C02F2 /* main.cpp */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {755, 311}}";
- sepNavSelRange = "{220, 0}";
- sepNavVisRange = "{0, 448}";
+ sepNavIntBoundsRect = "{{0, 0}, {755, 1071}}";
+ sepNavSelRange = "{832, 0}";
+ sepNavVisRange = "{0, 832}";
sepNavWindowFrame = "{{15, 4}, {976, 574}}";
};
};
E4B69E1E0A3A1BDC003C02F2 /* testApp.cpp */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {755, 1716}}";
- sepNavSelRange = "{569, 0}";
- sepNavVisRange = "{1365, 771}";
+ sepNavIntBoundsRect = "{{0, 0}, {755, 1690}}";
+ sepNavSelRange = "{741, 0}";
+ sepNavVisRange = "{0, 2024}";
sepNavWindowFrame = "{{15, 4}, {976, 574}}";
};
};
E4B69E1F0A3A1BDC003C02F2 /* testApp.h */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {755, 767}}";
- sepNavSelRange = "{1159, 0}";
- sepNavVisRange = "{649, 627}";
+ sepNavIntBoundsRect = "{{0, 0}, {755, 1071}}";
+ sepNavSelRange = "{695, 0}";
+ sepNavVisRange = "{0, 1278}";
};
};
E4B6FCAD0C3E899E008CF71C /* openFrameworks-Info.plist */ = {
diff --git a/src/keyVar.cpp b/src/keyVar.cpp
index ea8b9ff..8a5ce9a 100644
--- a/src/keyVar.cpp
+++ b/src/keyVar.cpp
@@ -23,22 +23,22 @@ void keyVar::keyPressed(char _key){
if (_key==keyInc&&state!=1) {
state=1;
timePressed=timeCalc=ofGetElapsedTimef();
- if (DEBUG) printf("pressed %i\n",_key);
+ if (DEBUG) printf("pressed %i:%i\n",_key,ofGetElapsedTimeMillis());
}
if (_key==keyDec&&state!=-1) {
state=-1;
timePressed=timeCalc=ofGetElapsedTimef();
- if (DEBUG) printf("pressed %i\n",_key);
+ if (DEBUG) printf("pressed %i:%i\n",_key,ofGetElapsedTimeMillis());
}
}
void keyVar::keyReleased(char _key){
if (_key==keyInc&&state==1) {
state=0;
- if (DEBUG) printf("released %i\n",_key);
+ if (DEBUG) printf("released %i:%i\n",_key,ofGetElapsedTimeMillis());
}
if (_key==keyDec&&state==-1) {
state=0;
- if (DEBUG) printf("released %i\n",_key);
+ if (DEBUG) printf("released %i:%i\n",_key,ofGetElapsedTimeMillis());
}
}
float keyVar::getVal(){
diff --git a/src/main.cpp b/src/main.cpp
index 3df2e96..1ed640d 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -2,12 +2,29 @@
#include "testApp.h"
#include "ofAppGlutWindow.h"
+// Includes for Mac OSX
+
+#include <GLUT/glut.h>
+#include <OpenGL/gl.h>
+#include <OpenGL/glu.h>
+
+/*
+ //Includes for Windows
+
+ #include <GL/glew.h>
+ #include <GL/glut.h>
+ #include <GL/freeglut.h>
+ #include <iostream>
+ */
+
//========================================================================
int main( ){
ofAppGlutWindow window;
- ofSetupOpenGL(&window, 1024,600, OF_FULLSCREEN); // <-------- setup the GL context
-
+ ofSetupOpenGL(&window, 512,512, OF_WINDOW); // <-------- setup the GL context
+ glutIgnoreKeyRepeat(1);
+ glutSetKeyRepeat(GLUT_KEY_REPEAT_OFF); //these don't work!!!
+ printf("key repeat ignore: %i\n",glutDeviceGet(GLUT_DEVICE_IGNORE_KEY_REPEAT));
// this kicks off the running of my app
// can be OF_WINDOW or OF_FULLSCREEN
// pass in width and height too:
diff --git a/src/testApp.cpp b/src/testApp.cpp
index 0d42e85..089e677 100644
--- a/src/testApp.cpp
+++ b/src/testApp.cpp
@@ -34,6 +34,7 @@ void testApp::setup(){
views[0].setup(GL_LIGHT0,ofGetWidth(),ofGetHeight(),0,0);
activeView=0;
+
}
diff --git a/src/testApp.h b/src/testApp.h
index 14fc09d..e2138a0 100644
--- a/src/testApp.h
+++ b/src/testApp.h
@@ -29,6 +29,8 @@ have to track how many frames each key has been pressed for
#include "mapUtils.h"
#include "viewpoint.h"
+
+
class testApp : public ofBaseApp{
public:
diff --git a/src/viewpoint.cpp b/src/viewpoint.cpp
index 0c7fe8a..39e8d32 100644
--- a/src/viewpoint.cpp
+++ b/src/viewpoint.cpp
@@ -13,20 +13,20 @@ void viewpoint::setup(int ln,float w, float h, float x, float y) {
near=1;
far=20;
- camera.setParent(target);
+ //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',112,10,3.0,3.0);
- vars[3].set('t','c',0.0,10,3.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,10,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);
- camera.setPosition(0,0,vars[6].getVal());
+ //camera.setPosition(0,0,vars[6].getVal());
}
//--------------------------------------------------------------
void viewpoint::setLight(){
@@ -37,10 +37,10 @@ void viewpoint::setLight(){
camera.setPosition(0,0,vars[6].getVal());
*/
- camera.orbit(vars[4].getVal(), vars[5].getVal(), vars[6].getVal(), target);
-
+ camera.orbit(vars[5].getVal(), vars[4].getVal(), vars[6].getVal(), target);
+ camera.lookAt(target,ofVec3f(0,1,0));
ofVec3f lp=camera.getGlobalPosition();
- GLfloat lightPosition[] = {lp.x, lp.y, lp.z};
+ 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);
@@ -107,6 +107,10 @@ void viewpoint::end(){
unbindTexture(renderFBO);
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);
}
//--------------------------------------------------------------
generated by cgit v1.2.3 (git 2.39.1) at 2025-12-06 08:04:23 +0000