got the lighting trick

4 files changed, 93 insertions, 61 deletions

diff --git a/map4.xcodeproj/tim.mode1v3 b/map4.xcodeproj/tim.mode1v3
index 375f1ce..4394d02 100644
--- a/map4.xcodeproj/tim.mode1v3
+++ b/map4.xcodeproj/tim.mode1v3
@@ -296,7 +296,7 @@
 							<real>186</real>
 						</array>
 						<key>RubberWindowFrame</key>
-						<string>-1 59 1024 519 0 0 1024 578 </string>
+						<string>0 59 1024 519 0 0 1024 578 </string>
 					</dict>
 					<key>Module</key>
 					<string>PBXSmartGroupTreeModule</string>
@@ -326,7 +326,7 @@
 										<key>_historyCapacity</key>
 										<integer>0</integer>
 										<key>bookmark</key>
-										<string>2226A4AB14B3CAEB00A9FC9F</string>
+										<string>22D4C35D14B4FAF600BC7337</string>
 										<key>history</key>
 										<array>
 											<string>220EA1EF14925D45004424ED</string>
@@ -343,7 +343,7 @@
 											<string>2226A47A14B3C58400A9FC9F</string>
 											<string>2226A47C14B3C58400A9FC9F</string>
 											<string>2226A4A514B3CAB700A9FC9F</string>
-											<string>2226A4A614B3CAB700A9FC9F</string>
+											<string>22AABA5214B4EBFD00280662</string>
 										</array>
 									</dict>
 									<key>SplitCount</key>
@@ -355,14 +355,14 @@
 							<key>GeometryConfiguration</key>
 							<dict>
 								<key>Frame</key>
-								<string>{{0, 0}, {816, 435}}</string>
+								<string>{{0, 0}, {816, 431}}</string>
 								<key>RubberWindowFrame</key>
-								<string>-1 59 1024 519 0 0 1024 578 </string>
+								<string>0 59 1024 519 0 0 1024 578 </string>
 							</dict>
 							<key>Module</key>
 							<string>PBXNavigatorGroup</string>
 							<key>Proportion</key>
-							<string>435pt</string>
+							<string>431pt</string>
 						</dict>
 						<dict>
 							<key>ContentConfiguration</key>
@@ -375,14 +375,14 @@
 							<key>GeometryConfiguration</key>
 							<dict>
 								<key>Frame</key>
-								<string>{{0, 440}, {816, 38}}</string>
+								<string>{{0, 436}, {816, 42}}</string>
 								<key>RubberWindowFrame</key>
-								<string>-1 59 1024 519 0 0 1024 578 </string>
+								<string>0 59 1024 519 0 0 1024 578 </string>
 							</dict>
 							<key>Module</key>
 							<string>XCDetailModule</string>
 							<key>Proportion</key>
-							<string>38pt</string>
+							<string>42pt</string>
 						</dict>
 					</array>
 					<key>Proportion</key>
@@ -401,9 +401,9 @@
 			</array>
 			<key>TableOfContents</key>
 			<array>
-				<string>2226A3FE14B3AF2600A9FC9F</string>
+				<string>22D4C34214B4ED2D00BC7337</string>
 				<string>1CE0B1FE06471DED0097A5F4</string>
-				<string>2226A3FF14B3AF2600A9FC9F</string>
+				<string>22D4C34314B4ED2D00BC7337</string>
 				<string>1CE0B20306471E060097A5F4</string>
 				<string>1CE0B20506471E060097A5F4</string>
 			</array>
@@ -541,15 +541,16 @@
 	<integer>5</integer>
 	<key>WindowOrderList</key>
 	<array>
-		<string>2226A40914B3AF2600A9FC9F</string>
-		<string>2226A40A14B3AF2600A9FC9F</string>
+		<string>22D4C35E14B4FAF600BC7337</string>
+		<string>22D4C35314B4F03D00BC7337</string>
+		<string>22D4C35414B4F03D00BC7337</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>-1 59 1024 519 0 0 1024 578 </string>
+	<string>0 59 1024 519 0 0 1024 578 </string>
 	<key>WindowToolsV3</key>
 	<array>
 		<dict>
@@ -626,7 +627,7 @@
 			<key>TableOfContents</key>
 			<array>
 				<string>22C080D114918C2F00E6B4C0</string>
-				<string>2226A40014B3AF2600A9FC9F</string>
+				<string>22D4C34414B4ED2D00BC7337</string>
 				<string>1CD0528F0623707200166675</string>
 				<string>XCMainBuildResultsModuleGUID</string>
 			</array>
@@ -748,13 +749,13 @@
 			<key>TableOfContents</key>
 			<array>
 				<string>1CD10A99069EF8BA00B06720</string>
-				<string>2226A40114B3AF2600A9FC9F</string>
+				<string>22D4C34C14B4F03D00BC7337</string>
 				<string>1C162984064C10D400B95A72</string>
-				<string>2226A40214B3AF2600A9FC9F</string>
-				<string>2226A40314B3AF2600A9FC9F</string>
-				<string>2226A40414B3AF2600A9FC9F</string>
-				<string>2226A40514B3AF2600A9FC9F</string>
-				<string>2226A40614B3AF2600A9FC9F</string>
+				<string>22D4C34D14B4F03D00BC7337</string>
+				<string>22D4C34E14B4F03D00BC7337</string>
+				<string>22D4C34F14B4F03D00BC7337</string>
+				<string>22D4C35014B4F03D00BC7337</string>
+				<string>22D4C35114B4F03D00BC7337</string>
 			</array>
 			<key>ToolbarConfiguration</key>
 			<string>xcode.toolbar.config.debugV3</string>
@@ -916,7 +917,7 @@
 			<key>TableOfContents</key>
 			<array>
 				<string>1C78EAAD065D492600B07095</string>
-				<string>2226A40714B3AF2600A9FC9F</string>
+				<string>22D4C35214B4F03D00BC7337</string>
 				<string>1C78EAAC065D492600B07095</string>
 			</array>
 			<key>ToolbarConfiguration</key>
diff --git a/map4.xcodeproj/tim.pbxuser b/map4.xcodeproj/tim.pbxuser
index c83b976..ced6680 100644
--- a/map4.xcodeproj/tim.pbxuser
+++ b/map4.xcodeproj/tim.pbxuser
@@ -89,6 +89,7 @@
 	};
 	2226A47B14B3C58400A9FC9F /* ofLight.h */ = {
 		isa = PBXFileReference;
+		lastKnownFileType = sourcecode.c.h;
 		name = ofLight.h;
 		path = /Developer/Library/openFrameworks/libs/openFrameworks/gl/ofLight.h;
 		sourceTree = "<absolute>";
@@ -113,22 +114,12 @@
 		vrLen = 835;
 		vrLoc = 0;
 	};
-	2226A4A614B3CAB700A9FC9F /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = E4B69E1E0A3A1BDC003C02F2 /* testApp.cpp */;
-		name = "testApp.cpp: 17";
-		rLen = 0;
-		rLoc = 399;
-		rType = 0;
-		vrLen = 713;
-		vrLoc = 0;
-	};
 	2226A4AB14B3CAEB00A9FC9F /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = E4B69E1E0A3A1BDC003C02F2 /* testApp.cpp */;
 		name = "testApp.cpp: 14";
 		rLen = 0;
-		rLoc = 289;
+		rLoc = 291;
 		rType = 0;
 		vrLen = 741;
 		vrLoc = 0;
@@ -188,11 +179,6 @@
 		name = ofNode.h;
 		path = /Developer/Library/openFrameworks/libs/openFrameworks/3d/ofNode.h;
 		sourceTree = "<absolute>";
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {971, 2184}}";
-			sepNavSelRange = "{3923, 78}";
-			sepNavVisRange = "{1618, 858}";
-		};
 	};
 	2257104214B1404F009BC2A4 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
@@ -231,6 +217,16 @@
 		vrLen = 1398;
 		vrLoc = 0;
 	};
+	22AABA5214B4EBFD00280662 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = E4B69E1E0A3A1BDC003C02F2 /* testApp.cpp */;
+		name = "testApp.cpp: 14";
+		rLen = 0;
+		rLoc = 291;
+		rType = 0;
+		vrLen = 740;
+		vrLoc = 0;
+	};
 	22AFFECF149798EE0079DDC5 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 22AFFED0149798EE0079DDC5 /* ofGraphics.h */;
@@ -279,6 +275,36 @@
 		isa = PBXCodeSenseManager;
 		indexTemplatePath = "";
 	};
+	22D4C34114B4ED2D00BC7337 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = E4B69E1E0A3A1BDC003C02F2 /* testApp.cpp */;
+		name = "testApp.cpp: 14";
+		rLen = 0;
+		rLoc = 291;
+		rType = 0;
+		vrLen = 740;
+		vrLoc = 0;
+	};
+	22D4C34B14B4F03D00BC7337 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = E4B69E1E0A3A1BDC003C02F2 /* testApp.cpp */;
+		name = "testApp.cpp: 18";
+		rLen = 0;
+		rLoc = 403;
+		rType = 0;
+		vrLen = 721;
+		vrLoc = 0;
+	};
+	22D4C35D14B4FAF600BC7337 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = E4B69E1E0A3A1BDC003C02F2 /* testApp.cpp */;
+		name = "testApp.cpp: 17";
+		rLen = 0;
+		rLoc = 371;
+		rType = 0;
+		vrLen = 697;
+		vrLoc = 0;
+	};
 	22EF433814AF89EF003C3497 /* mapUtils.cpp */ = {
 		uiCtxt = {
 			sepNavIntBoundsRect = "{{0, 0}, {761, 1248}}";
@@ -328,26 +354,29 @@
 					PBXFileDataSource_Target_ColumnID,
 				);
 			};
-			PBXPerProjectTemplateStateSaveDate = 347320085;
-			PBXWorkspaceStateSaveDate = 347320085;
+			PBXPerProjectTemplateStateSaveDate = 347401505;
+			PBXWorkspaceStateSaveDate = 347401505;
 		};
 		perUserProjectItems = {
-			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 */;
+			220EA1EF14925D45004424ED = 220EA1EF14925D45004424ED /* PBXTextBookmark */;
+			2226A43014B3B80600A9FC9F = 2226A43014B3B80600A9FC9F /* PBXTextBookmark */;
+			2226A46F14B3BF5C00A9FC9F = 2226A46F14B3BF5C00A9FC9F /* PBXTextBookmark */;
+			2226A47914B3C58400A9FC9F = 2226A47914B3C58400A9FC9F /* PBXTextBookmark */;
+			2226A47A14B3C58400A9FC9F = 2226A47A14B3C58400A9FC9F /* PBXTextBookmark */;
+			2226A47C14B3C58400A9FC9F = 2226A47C14B3C58400A9FC9F /* PBXTextBookmark */;
+			2226A4A514B3CAB700A9FC9F = 2226A4A514B3CAB700A9FC9F /* PBXTextBookmark */;
+			2226A4AB14B3CAEB00A9FC9F = 2226A4AB14B3CAEB00A9FC9F /* PBXTextBookmark */;
+			22570F8114B111F1009BC2A4 = 22570F8114B111F1009BC2A4 /* PBXTextBookmark */;
+			22570F8214B111F1009BC2A4 = 22570F8214B111F1009BC2A4 /* PBXTextBookmark */;
+			2257104214B1404F009BC2A4 = 2257104214B1404F009BC2A4 /* PBXTextBookmark */;
+			2257104414B1404F009BC2A4 = 2257104414B1404F009BC2A4 /* PBXTextBookmark */;
+			22578A0914B34BAC0036E99C = 22578A0914B34BAC0036E99C /* PBXTextBookmark */;
+			22AABA5214B4EBFD00280662 = 22AABA5214B4EBFD00280662 /* PBXTextBookmark */;
+			22AFFECF149798EE0079DDC5 = 22AFFECF149798EE0079DDC5 /* PBXTextBookmark */;
+			22AFFED1149798EE0079DDC5 = 22AFFED1149798EE0079DDC5 /* PBXTextBookmark */;
+			22D4C34114B4ED2D00BC7337 /* PBXTextBookmark */ = 22D4C34114B4ED2D00BC7337 /* PBXTextBookmark */;
+			22D4C34B14B4F03D00BC7337 /* PBXTextBookmark */ = 22D4C34B14B4F03D00BC7337 /* PBXTextBookmark */;
+			22D4C35D14B4FAF600BC7337 /* PBXTextBookmark */ = 22D4C35D14B4FAF600BC7337 /* PBXTextBookmark */;
 		};
 		sourceControlManager = 22C080CC1491244000E6B4C0 /* Source Control */;
 		userBuildSettings = {
@@ -369,9 +398,9 @@
 	};
 	E4B69E1E0A3A1BDC003C02F2 /* testApp.cpp */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {755, 1742}}";
-			sepNavSelRange = "{289, 0}";
-			sepNavVisRange = "{0, 741}";
+			sepNavIntBoundsRect = "{{0, 0}, {755, 1781}}";
+			sepNavSelRange = "{371, 0}";
+			sepNavVisRange = "{0, 697}";
 			sepNavWindowFrame = "{{15, 4}, {976, 574}}";
 		};
 	};
diff --git a/src/testApp.cpp b/src/testApp.cpp
index e9ae5ee..5bd6f0a 100644
--- a/src/testApp.cpp
+++ b/src/testApp.cpp
@@ -4,16 +4,18 @@
 void testApp::setup(){
 	ofBackground(0,0,0);
 
+	
 	///ofSetVerticalSync(true);
 
     //some model / light stuff
     glEnable (GL_DEPTH_TEST);
     glShadeModel (GL_SMOOTH);
 
-    // initialize lighting 
+    //initialize lighting 
     //glEnable (GL_LIGHTING);
     glColorMaterial (GL_FRONT_AND_BACK, GL_DIFFUSE);
     glEnable (GL_COLOR_MATERIAL);
+	 
 
     //load the bottle model - the 3ds and the texture file need to be in the same folder
     bottle.loadModel("bottle.3DS", 1);
diff --git a/src/viewpoint.cpp b/src/viewpoint.cpp
index 62d5f64..efb6894 100644
--- a/src/viewpoint.cpp
+++ b/src/viewpoint.cpp
@@ -31,7 +31,7 @@ void viewpoint::setup(int ln,float w, float h, float x, float y) {
 	getLightPosition=new GLfloat[4];
 	
 	light.enable();
-	light.setPointLight();
+	light.setDirectional();
 }
 //--------------------------------------------------------------
 void viewpoint::setLight(){