From 5ee1cfdfc4e9ddc656d37eec25adba792bd922ce Mon Sep 17 00:00:00 2001
From: Nick Gasson <nick@nickg.me.uk>
Date: Fri, 10 Jul 2009 21:25:06 +0100
Subject: [PATCH] Add house model

---
 house.mtl           |  10 ++++++++++
 house.obj           |  42 ++++++++++++++++++++++++++++++++++++++++++
 house.wings         | Bin 0 -> 501 bytes
 src/Editor.cpp      |   5 ++++-
 src/ModelViewer.cpp |   2 +-
 5 files changed, 57 insertions(+), 2 deletions(-)
 create mode 100644 house.mtl
 create mode 100644 house.obj
 create mode 100644 house.wings

diff --git a/house.mtl b/house.mtl
new file mode 100644
index 0000000..6f9b7db
--- /dev/null
+++ b/house.mtl
@@ -0,0 +1,10 @@
+# Exported from Wings 3D 1.0.1
+newmtl default
+Ns 100.0
+d 1.0
+illum 2
+Kd 1.0 1.0 1.0
+Ka 1.0 1.0 1.0
+Ks 1.0 1.0 1.0
+Ke 0.0 0.0 0.0
+
diff --git a/house.obj b/house.obj
new file mode 100644
index 0000000..8fa8cd5
--- /dev/null
+++ b/house.obj
@@ -0,0 +1,42 @@
+# Exported from Wings 3D 1.0.1
+mtllib house.mtl
+o cube2
+#10 vertices, 16 faces
+v -0.50000000 -4.4444444e-4 0.50000000
+v -0.50000000 0.99955556 0.50000000
+v 0.50000000 0.99955556 0.50000000
+v 0.50000000 -4.4444444e-4 0.50000000
+v -0.50000000 -4.4444444e-4 -0.50000000
+v -0.50000000 0.99955556 -0.50000000
+v 0.50000000 0.99955556 -0.50000000
+v 0.50000000 -4.4444444e-4 -0.50000000
+v -0.50000000 1.30782683 0.0000000e+0
+v 0.50000000 1.30782683 0.0000000e+0
+vn -0.57735027 -0.57735027 0.57735027
+vn -0.65158146 0.36975861 0.66235955
+vn 0.75326365 0.32059581 0.57429278
+vn 0.57735027 -0.57735027 0.57735027
+vn -0.57735027 -0.57735027 -0.57735027
+vn -0.75326365 0.32059581 -0.57429278
+vn 0.65158146 0.36975861 -0.66235955
+vn 0.57735027 -0.57735027 -0.57735027
+vn -0.35813602 0.91455554 -0.18795414
+vn 0.35813602 0.91455554 0.18795414
+g cube2_default
+usemtl default
+f 1//1 4//4 2//2
+f 1//1 5//5 4//4
+f 2//2 4//4 3//3
+f 2//2 5//5 1//1
+f 2//2 10//10 9//9
+f 3//3 7//7 10//10
+f 3//3 10//10 2//2
+f 4//4 5//5 8//8
+f 4//4 7//7 3//3
+f 5//5 2//2 6//6
+f 5//5 7//7 8//8
+f 6//6 7//7 5//5
+f 6//6 9//9 7//7
+f 7//7 9//9 10//10
+f 8//8 7//7 4//4
+f 9//9 6//6 2//2
diff --git a/house.wings b/house.wings
new file mode 100644
index 0000000000000000000000000000000000000000..09f810c94f8895c98472e1d0e752218c13b5f4c3
GIT binary patch
literal 501
zcmV<R0Sf*jAy-LGM^h~^E-(!W8Uz3U0pf#D000K9c%03Wy^hmB5XaZ{+FmD@4?0SE
zBoq)W%4;AfP807Wwy_;6Ym0ZFqv0*+=<^a((C`2V8cGUg)^{hgn}akbSjlU9e*c;O
z>_-u45x*|moq@23Y9T~WNG+26roy~`CE|S8;FBVz5UWtL<ld;uw2-KG2m%67G%q2f
zuc-2HL{A8@ol_r63M<GcSAcSHK#=njk_m`?tf+7V7vvtn+{K*BWm8!2mya_Fr!c2^
z0W%jfV*e>w1dzE{QdpAzgsOzF^l?hzaaJ&Oacq~AP;o`wd)^7<Np_|33xC&m)m&jo
zqB%@loDt#*6M_jW{A?CPFe7K`!QYm|u6#!C*zY``pt292-9=@2R^1H#o!Fd)ru)Y)
z!j9v!2X9`yeJa*h|CKLUfB*UN+lTj`PDs}0OU^L5mK<-FTpOK`xV`*Aa*olDub)3Y
zf7b|cyOApyH#saqEoNOk?8^4i^w6WJI3%0BMlDoBkwXb}b#;P-QjJ>}>i#BOHqeb(
z$-cvOS2KyN6q-$mZC}Xz@uSs=fe%+J+s<9{vGH=d9Sr^--6(8IW6FI??X3P%?v6RP
rlbNDy%NC6}t9jF5KGbmd_j~#KMV^`*TfFQJxE(K~bF-^o0U~d$akKHr

literal 0
HcmV?d00001

diff --git a/src/Editor.cpp b/src/Editor.cpp
index 2b970d5..1d88ac9 100644
--- a/src/Editor.cpp
+++ b/src/Editor.cpp
@@ -118,9 +118,12 @@ void addEditorGUI()
    
    theToolMenu = new Fl_Menu_Button(0, 0, panelW, 32);
    theToolMenu->copy(theTools);
+	theToolMenu->label("Track");
 
+   debug() << theToolMenu->value();
+   
    theModelViewer = new ModelViewer(0, 40, panelW, 200);
-   theModelViewer->setModel(loadModel("pclass.obj"));
+   theModelViewer->setModel(loadModel("house.obj"));
 }
 
 Editor::Editor(IMapPtr aMap, const string& aFileName) 
diff --git a/src/ModelViewer.cpp b/src/ModelViewer.cpp
index c78f6ab..85c74a8 100644
--- a/src/ModelViewer.cpp
+++ b/src/ModelViewer.cpp
@@ -60,7 +60,7 @@ void ModelViewer::draw()
    if (myModel) {
       glRotatef(45.0f, 1.0f, 0.0f, 0.0f);
       glRotatef(45.0f, 0.0f, 1.0f, 0.0f);
-      glTranslatef(5.0f, -8.0f, -4.0f);
+      glTranslatef(1.5f, -2.6f, -1.5f);
       glColor3f(1.0f, 1.0f, 1.0f);
       myModel->render();
    }
-- 
2.39.2