fix confict

.travis.yml

@@ -0,0 +1,27 @@
+group: travis_latest
+language: python
+cache: pip
+python:
+    - 2.7
+    - 3.6
+    #- nightly
+    #- pypy
+    #- pypy3
+matrix:
+    allow_failures:
+        - python: nightly
+        - python: pypy
+        - python: pypy3
+install:
+    - pip install -r requirements.txt
+    - pip install flake8  # pytest  # add another testing frameworks later
+before_script:
+    # stop the build if there are Python syntax errors or undefined names
+    - flake8 . --count --select=E901,E999,F821,F822,F823 --show-source --statistics
+    # exit-zero treats all errors as warnings.  The GitHub editor is 127 chars wide
+    - flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
+script:
+    - python run_basics.py  # Can run only with python and tensorflow
+notifications:
+    on_success: change
+    on_failure: change  # `always` will be the setting once code changes slow down

requirements.txt

@@ -0,0 +1,4 @@
+numpy>=1.14.3
+scikit-image
+scipy
+tensorflow

utils/render.py

@@ -341,13 +341,13 @@ def vis_of_vertices(vertices, triangles, h, w, depth_buffer = None):
 
     return vertices_vis
 
-## To be modified
+# TODO: To be modified
 def triangle_buffer(vertices, triangles, h, w):
     '''
     Args:
         vertices: 3 x nver
         triangles: 3 x ntri
-        h: height
+        h: height  # [h, w, _] = image.shape
         w: width
     Returns:
         depth_buffer: height x width
@@ -358,9 +358,6 @@ def triangle_buffer(vertices, triangles, h, w):
     # Each triangle has 3 vertices & Each vertex has 3 coordinates x, y, z.
     # Here, the bigger the z, the fronter the point.
     '''
-    # initial 
-    [h, w, _] = image.shape
-
     depth_buffer = np.zeros([h, w]) + 999999. #+ np.min(vertices[2,:]) - 999999. # set the initial z to the farest position
     triangle_buffer = np.zeros_like(depth_buffer, dtype = np.int32) - 1 # if -1, the pixel has no triangle correspondance