Browse Source

Added teapot & torus models from Hgdavidy's pull request.

Lasse Öörni 11 years ago
parent
commit
ec43000d09

BIN
Bin/Data/Models/TeaPot.mdl


BIN
Bin/Data/Models/Torus.mdl


+ 1 - 1
Bin/Data/Scripts/Editor/EditorUI.as

@@ -359,7 +359,7 @@ void CreateMenuBar()
 
         childMenu = CreateMenuItem("Builtin object", null, SHOW_POPUP_INDICATOR);
         childPopup = CreatePopup(childMenu);
-        String[] objects = { "Box", "Cone", "Cylinder", "Plane", "Pyramid", "Sphere" };
+        String[] objects = { "Box", "Cone", "Cylinder", "Plane", "Pyramid", "Sphere", "TeaPot", "Torus" };
         for (uint i = 0; i < objects.length; ++i)
             childPopup.AddChild(CreateIconizedMenuItem(objects[i], @PickBuiltinObject, 0, 0, "Node", true, "Create " + objects[i]));
         popup.AddChild(childMenu);

+ 1 - 0
Docs/Urho3D.dox

@@ -73,6 +73,7 @@ Urho3D development, contributions and bugfixes by:
 - Ali K&auml;m&auml;r&auml;inen
 - Pete Leigh
 - Paul Noome
+- David Palacios
 - Alex Parlett
 - Jordan Patterson
 - Vladimir Pobedinsky

+ 1 - 0
Readme.txt

@@ -29,6 +29,7 @@ Urho3D development, contributions and bugfixes by:
 - Ali Kämäräinen
 - Pete Leigh
 - Paul Noome
+- David Palacios
 - Alex Parlett
 - Jordan Patterson
 - Vladimir Pobedinsky

BIN
SourceAssets/TeaPot.blend


+ 10 - 0
SourceAssets/TeaPot_copyright.txt

@@ -0,0 +1,10 @@
+Martin Newell modeled this teapot using bicubic Bezier patches in 1975
+as part of an entire tea set. It first appeared in his
+Ph.D. dissertation. Jim Blinn scaled the teapot horizontally by 1.3x
+to cancel the effect of the rectangular pixels on their display. The
+original had no bottom; most variations add one. Kenzie Lamar at
+Vicarious Visions created this version from the default teapot model
+in 3D Studio Max. He resized the top so that it fits snugly, created a
+shell and welded the spout and handle so that the teapot is a manifold
+without boundary, and created a unique and consistent resolution texture
+parameterization for the entire model.

BIN
SourceAssets/Torus.blend