Colorize drawings

Author: baioc

.gitignore

@@ -18,5 +18,6 @@ venv/
 # build artifacts
 *.zip
 
-# obj
+# OBJ
 *.obj
+*.mtl

Makefile

@@ -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 objs/scene.obj
+submission.zip: $(PY_SOURCES) $(QT_OBJECTS) Makefile README.md objs/scene.obj objs/palette.mtl
 	@ make test
 	@ make mostlyclean
 	mkdir PyCG
@@ -48,5 +48,6 @@ submission.zip: $(PY_SOURCES) $(QT_OBJECTS) Makefile README.md objs/scene.obj
 	cp README.md PyCG
 	mkdir PyCG/objs
 	cp objs/scene.obj PyCG/objs
+	cp objs/palette.mtl PyCG/objs
 	zip -r submission.zip PyCG
 	rm -r PyCG

objs/.gitignore

@@ -1,2 +1,3 @@
-# keep the OBJs in this folder
+# keep the OBJ stuff in this folder
 !*.obj
+!*.mtl

objs/palette.mtl

@@ -0,0 +1,14 @@
+newmtl red
+Kd 1 0 0
+
+newmtl green
+Kd 0 1 0
+
+newmtl blue
+Kd 0 0 1
+
+newmtl black
+Kd 0 0 0
+
+newmtl white
+Kd 1 1 1

objs/sample.mtl

@@ -0,0 +1,5 @@
+newmtl red
+Kd 1.000000 0.000000 0.000000
+
+newmtl texture
+Kd 0.800000 0.800000 0.800000

objs/scene.obj

@@ -1,3 +1,5 @@
+mtllib palette.mtl
+
 v -950 0 1.0 1.0
 v 1605 0 1.0 1.0
 v -575 0 1.0 1.0
@@ -12,11 +14,19 @@ v 478 75 1.0 1.0
 v 696 134 1.0 1.0
 v 475 250 1.0 1.0
 v 950 0 1.0 1.0
+
 o horizon
+usemtl green
 l 1 2
+
 o mountain
+usemtl red
 f 3 4 5 6 7
+
 o peak
+usemtl white
 p 6
+
 o snow_mountain
+usemtl blue
 l 8 9 10 11 12 13 14 8

pycg/app.py

@@ -2,6 +2,7 @@
 
 from math import inf, radians
 from sys import argv
+from os import path
 from typing import Optional, Callable, Dict, Sequence, Tuple
 from ast import literal_eval
 
@@ -13,7 +14,7 @@
 
 from blas import Vector
 from graphics import (Painter, Camera, Transformation, Drawable, Point, Line,
-                      Wireframe, Polygon)
+                      Wireframe, Polygon, Color)
 from utilities import experp, begin, sign, to_float
 import obj as wavefront_obj
 from ui.main import Ui_MainWindow
@@ -95,15 +96,28 @@ def handle_save_action():
             else:
                 name = self.displayFile.currentItem().text()
                 model = self.display_file[name]
-                path, _ = QFileDialog.getSaveFileName(
+
+                modelpath, _ = QFileDialog.getSaveFileName(
                     self,
                     "Select .obj file to save",
                     name + '.obj',
                 )
-                if path.strip() != '':
-                    with wavefront_obj.open(path, 'w+') as file:
-                        file.write(model, name)
-                        self.log(f"Saved object '{name}' to '{path}'")
+                if modelpath.strip() == '': return
+
+                mtlpath, _ = QFileDialog.getSaveFileName(
+                    self,
+                    "Select .mtl file to save",
+                    name + '.mtl',
+                )
+                if mtlpath.strip() != '':
+                    color = model.color
+                    with open(mtlpath, 'w+') as file:
+                        file.write(f"newmtl color\n")
+                        file.write(f"Kd {color.r/255} {color.g/255} {color.b/255}\n")
+
+                with wavefront_obj.open(modelpath, 'w+', mtllib=path.basename(mtlpath)) as file:
+                    file.write(model, name, usemtl='color')
+                    self.log(f"Saved object '{name}' to '{mtlpath}'")
 
         def handle_new_action():
             new_obj = None
@@ -185,7 +199,8 @@ def new_object():
 
             name = self.nameEdit.text()
             typename = self.typeBox.currentText()
-            color = self.colorEdit.text()
+            color = QColor(self.colorEdit.text())
+            color = Color(color.red(), color.green(), color.blue())
 
             # indexes of QLayout.itemAt() depend on the order of UI elements
             obj = None
@@ -257,7 +272,7 @@ def enableRotateLabels():
         self.log("Interactive Graphical System initialized.")
 
     def insert_object(self, obj: Drawable, name,
-                      index: int = None, color: str = None) -> int:
+                      index: int = None, color: Color = None) -> int:
         """Put an object in the Display File, returning its position."""
 
         n = self.displayFile.count()
@@ -275,7 +290,10 @@ def insert_object(self, obj: Drawable, name,
             name = prefix + str(count)
         self.display_file[name] = obj
 
-        obj.color = color or QPalette().color(QPalette.Foreground).name()
+        if not color:
+            color = QPalette().color(QPalette.Foreground)
+            color = Color(color.red(), color.green(), color.blue())
+        obj.color = color
         self.displayFile.insertItem(index, name)
         self.log(f"Added {type(obj).__name__} '{name}' to Display File.")
         self.displayFile.setCurrentRow(index)
@@ -309,8 +327,12 @@ def load_obj(self, path: str = None):
         path = path or QFileDialog.getOpenFileName(self, "Select .obj file to load")[0]
         if path.strip() != '':
             with wavefront_obj.open(path, 'r') as file:
-                for model, name in file:
-                    self.insert_object(model, name)
+                for model, attributes in file:
+                    self.insert_object(
+                        model,
+                        name=attributes['name'],
+                        color=attributes.get('color', None),
+                    )
 
 
 class QtViewport(QWidget):
@@ -374,8 +396,8 @@ def paintEvent(self, event):  # this is where we draw our scene
         painter.drawRect(40, 40, w - 80, h-80)
 
         for drawable in self._display_file.values():
-            painter.setPen(QColor(drawable.color))
-            painter.setBrush(QColor(drawable.color))
+            painter.setPen(QColor(str(drawable.color)))
+            painter.setBrush(QColor(str(drawable.color)))
             drawable.draw(self.camera)
 
         painter.end()

pycg/graphics.py

@@ -4,7 +4,7 @@
 from typing import Iterable, Tuple, Sequence
 
 from blas import Vector, Matrix
-from utilities import pairwise
+from utilities import pairwise, clamp
 
 
 class Painter():
@@ -513,3 +513,48 @@ def clip_polygon(points: Sequence[Tuple[float, float]]) -> Sequence[Tuple[float,
         points = new
 
     return points
+
+
+class Color:
+    def __init__(self, r, g, b, a = 0xFF):
+        self._r = clamp(int(r), 0x00, 0xFF)
+        self._g = clamp(int(g), 0x00, 0xFF)
+        self._b = clamp(int(b), 0x00, 0xFF)
+        self._a = clamp(int(a), 0x00, 0xFF)
+
+    def __repr__(self):
+        return '#' + ''.join('%02x' % x for x in (self.r, self.g, self.b))
+
+    def __eq__(self, other) -> bool:
+        return self.r == other.r \
+           and self.g == other.g \
+           and self.b == other.b \
+           and self.a == other.a
+
+    @property
+    def r(self):
+        return self._r
+
+    @r.setter
+    def r(self, r):
+        self._r = clamp(int(r), 0x00, 0xFF)
+
+    @property
+    def g(self):
+        return self._g
+
+    @g.setter
+    def g(self, g):
+        self._g = clamp(int(g), 0x00, 0xFF)
+
+    @property
+    def b(self):
+        return self._b
+
+    @b.setter
+    def b(self, b):
+        self._b = clamp(int(b), 0x00, 0xFF)
+
+    @property
+    def a(self):
+        return self._a