Add 3D object inputs in UI

Author: baioc

Makefile

@@ -15,7 +15,7 @@ QT_OBJECTS := $(patsubst $(QT_SRC)/%.ui, $(QT_OBJ)/%.py, $(QT_SOURCES))
 
 # default
 run: $(QT_OBJECTS)
-	$(PYTHON) $(PY_APP) objs/blender.obj
+	$(PYTHON) $(PY_APP) objs/world.obj
 
 test:
 	$(PYTHON) -m pytest -vv -s
@@ -38,7 +38,7 @@ release: submission.zip
 $(QT_OBJ)/%.py: $(QT_SRC)/%.ui
 	$(QT_COMPILER) $< -o $@
 
-submission.zip: $(PY_SOURCES) $(QT_OBJECTS) Makefile README.md requirements.txt objs/blender.obj objs/palette.mtl
+submission.zip: $(PY_SOURCES) $(QT_OBJECTS) Makefile README.md requirements.txt objs/world.obj objs/palette.mtl
 	@ make test
 	@ make mostlyclean
 	mkdir PyCG
@@ -48,7 +48,7 @@ submission.zip: $(PY_SOURCES) $(QT_OBJECTS) Makefile README.md requirements.txt
 	cp README.md PyCG
 	cp requirements.txt PyCG
 	mkdir PyCG/objs
-	cp objs/blender.obj PyCG/objs
+	cp objs/world.obj PyCG/objs
 	cp objs/palette.mtl PyCG/objs
 	zip -r submission.zip PyCG
 	rm -r PyCG

data/main.ui

@@ -551,12 +551,22 @@
                   <string>BSpline</string>
                  </property>
                 </item>
+                <item>
+                 <property name="text">
+                  <string>Wireframe</string>
+                 </property>
+                </item>
+                <item>
+                 <property name="text">
+                  <string>Mesh</string>
+                 </property>
+                </item>
                </widget>
               </item>
               <item row="3" column="1">
                <widget class="QPlainTextEdit" name="pointsText">
                 <property name="placeholderText">
-                 <string>Points in the format (x1, y1, z1), (x2, y2, z2), ...</string>
+                 <string>Points in the format (x1, y1, z1), (x2, y2, z2) ...;</string>
                 </property>
                </widget>
               </item>

objs/blender.obj

@@ -15,37 +15,6 @@ v 696 134 1.0 1.0
 v 475 250 1.0 1.0
 v 950 0 1.0 1.0
 
-v -300 0 -20 1.0
-v -100 0 -20 1.0
-v -200 0 80 1.0
-v -200 100 30 1.0
-
-v 0 0 0 1.0
-v 0 100 0 1.0
-v 100 100 0 1.0
-v 100 0 0 1.0
-v 0 0 100 1.0
-v 0 100 100 1.0
-v 100 100 100 1.0
-v 100 0 100 1.0
-v 0 0 0 1.0
-v 0 0 100 1.0
-v 0 100 100 1.0
-v 0 100 0 1.0
-v 100 0 0 1.0
-v 100 0 100 1.0
-v 100 100 100 1.0
-v 100 100 0 1.0
-v 0 100 0 1.0
-v 100 100 0 1.0
-v 100 100 100 1.0
-v 0 100 100 1.0
-v 0 0 0 1.0
-v 100 0 0 1.0
-v 100 0 100 1.0
-v 0 0 100 1.0
-
-
 o horizon
 usemtl green
 l 1 2
@@ -61,12 +30,3 @@ p 6
 o snow_mountain
 usemtl blue
 l 8 9 10 11 12 13 14 8
-
-o pyramid
-l 15 16 17 15
-l 15 16 18 15
-l 15 17 18 15
-l 16 18 17 16
-
-o cube
-l 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42