Merge pull request #23 from garvita-tiwari/Texture

Texture

.gitignore

@@ -1,11 +1,17 @@
-__pycache__/
-renders/
-build/
-dist/
-.venv-blender
-*.zip
-data_samples
-preview.png
-hdri_thumbs/
-temp.png
-blender_render.log
+# Ignore everything
+*
+
+# Allow these files
+*.py                                # Python source code
+*.md                                # Markdown files, e.g. the Readme
+requirements.txt                    # requirements for pip
+main-linux.spec
+main-windows.spec
+assets/HDRIs/*.hdr                  # HDRI images
+assets/textures/brick.png           # Texture files should be png only for highest quality
+assets/textures/iron.png
+assets/textures/wood.png
+assets/default_settings.yaml        # Default settings should be included, but not "settings.yaml"
+assets/gui/icon.ico                 # Program icon
+assets/gui/empty_bg.png             # Empty image if no render has happend yet
+/assets/gui/preview_unavailable.png

Texture.py

@@ -0,0 +1,20 @@
+import bpy
+
+#import the Texture image
+def load_texture(texture_path: str, material: bpy.types.Material):
+  if material.node_tree.nodes.get("Image Texture") is None:
+    texImage = material.node_tree.nodes.new(type = "ShaderNodeTexImage")
+  else:
+    texImage = material.node_tree.nodes.get("Image Texture")
+  texImage.image = bpy.data.images.load(bpy.path.relpath(texture_path))
+
+  #disp is path of Base color
+  disp=material.node_tree.nodes["Principled BSDF"].inputs["Base Color"]
+
+  #connect the node between 'Base Color' of bsdf and 'Color' of texImage
+  material.node_tree.links.new(disp,texImage.outputs[0])
+
+
+def delete_texture(material: bpy.types.Material):
+  disp=material.node_tree.nodes["Principled BSDF"].inputs["Base Color"]
+  material.node_tree.links.remove(disp.links[0])

gui/gui_main.py

@@ -5,7 +5,6 @@
 # description:
 # GUI element: Main program, renders the GUI and connects it to other function
 
-from cgi import print_directory
 import tkinter as tk
 from tkinter import Frame, Label, Button, StringVar, BooleanVar, IntVar, Checkbutton, OptionMenu, Scale, Canvas, Entry, PhotoImage
 from tkinter import ttk
@@ -18,6 +17,7 @@
 import threading
 import requests
 import enum
+from Texture import load_texture, delete_texture
 
 from gui.render_preview import RenderPreview
 from gui.gui_options import SettingsWindow
@@ -462,7 +462,7 @@ def __init__(self, master, control):
         lbl_textures = Label(master=self, text="Texture selection:", font="Arial 10 bold")
         btn_import_texture = Button(master=self, text="Import", command=self.import_texture)
         lbl_sel_tex    = Label(master=self, text="Select:")
-        textures = (Textures.NONE.value, Textures.WOOD.value, Textures.BRICKS.value)
+        textures = (Textures.NONE.value, Textures.WOOD.value, Textures.BRICKS.value, Textures.IRON.value)
         dropdown_textures = OptionMenu(self, tex_selected, *textures, command=self.set_texture)
         lbl_textures.grid(row=0, column=0, columnspan=2, sticky="we")
         btn_import_texture.grid(row=1, column=0, columnspan=2, sticky="")
@@ -472,19 +472,25 @@ def __init__(self, master, control):
     def set_texture(self, *args):
         tex = Textures(args[0])
         if tex == Textures.WOOD:
-            pass
+            load_texture("assets/textures/wood.png", self.control.material.material)
         elif tex == Textures.BRICKS:
-            pass
+            load_texture("assets/textures/brick.png", self.control.material.material)
+        elif tex == Textures.IRON:
+            load_texture("assets/textures/iron.png", self.control.material.material)
         else: # NONE
-            pass
+            delete_texture(self.control.material.material)
         self.control.re_render()
 
     def import_texture(self):
         filetypes = [
             ("PNG image", "*.png"),
+            ("jpg image", "*.jpg")
         ]
         filename = filedialog.askopenfilename(title="Select a texture", filetypes=filetypes)
-        # TODO Apply the texure to the object
+        if filename == "":
+            return
+
+        load_texture(filename, self.control.material.material)
         self.control.re_render()
 
 
@@ -493,6 +499,8 @@ class Textures(enum.Enum):
     NONE = "none"
     WOOD = "wood"
     BRICKS = "bricks"
+    IRON = "iron"
+
 
 class LightingWidgets(Frame):
     # constants