Merge pull request #2 from kubark42/master

Added Death Star
peabody124 · Nov 8, 2012 · 8e6f06d · 8e6f06d
2 parents 1ea2eb8 + 741ae24
commit 8e6f06d
Show file tree

Hide file tree

Showing 8 changed files with 818,409 additions and 2 deletions.
diff --git a/easystar/easystar.3ds → airframe_models/easystar/easystar.3ds b/easystar/easystar.3ds → airframe_models/easystar/easystar.3ds
diff --git a/easystar/easystar.jpg → airframe_models/easystar/easystar.jpg b/easystar/easystar.jpg → airframe_models/easystar/easystar.jpg
diff --git a/easystar/texture.jpg → airframe_models/easystar/texture.jpg b/easystar/texture.jpg → airframe_models/easystar/texture.jpg
diff --git a/joe_cnc/J14-QT_X.3DS → airframe_models/joe_cnc/J14-QT_X.3DS b/joe_cnc/J14-QT_X.3DS → airframe_models/joe_cnc/J14-QT_X.3DS
diff --git a/joe_cnc/TEXTURE.PNG → airframe_models/joe_cnc/TEXTURE.PNG b/joe_cnc/TEXTURE.PNG → airframe_models/joe_cnc/TEXTURE.PNG
diff --git a/osg_models/death star.osg b/osg_models/death star.osg
diff --git a/boston.earth → osgearth_models/boston.earth b/boston.earth → osgearth_models/boston.earth
diff --git a/visualization.cpp b/visualization.cpp
@@ -102,8 +102,8 @@ double homeLat=42.349273;
 double homeLon=-71.100549;
 double homeAlt=0;
 double initialAlt=200;
-string earthFile="boston.earth";
-string modelFile="joe_cnc/J14-QT_X.3DS";
+string earthFile="osgearth_models/boston.earth";
+string modelFile="airframe_models/joe_cnc/J14-QT_X.3DS";
 //! Magic value to check the static data
 enum magic_value { MAGIC_VALUE = 0xAF01BC32 };