diff --git a/model.blend b/model.blend index 827d317..9deab4f 100644 Binary files a/model.blend and b/model.blend differ diff --git a/render.py b/render.py index 2d7aee9..47b8f9c 100644 --- a/render.py +++ b/render.py @@ -12,7 +12,7 @@ def set_exclude(model, value): def set_color(model, color): for obj in base_collection.children[model].collection.all_objects.values(): - if len(obj.material_slots) != 3: + if len(obj.material_slots) < 3: continue obj.material_slots[1].material = bpy.data.materials[f"Liquid Surface {color}"] obj.material_slots[2].material = bpy.data.materials[f"Liquid Glass {color}"] @@ -25,27 +25,43 @@ def render_bottle(color, model, output): set_exclude(model, True) models = [ - "Cube", - "Sphere", - "Spiked", "Cone", + "Cone Slim", + "Cone Inverted", "Cylinder", -# "Tubes Duo", + "Tube", + "Tubes Duo", "Tubes Trio", + "Sphere", + "Sphere Tiny", + "Sphere Double", + "Sphere Tubed", + "Cube", + "Spiked", + "Pyramid", + "Triangle", + "Triangle Alt", "Pentagon", "Hexagon", ] + bottles = [ ["Red", "Cone", "//src/graphics/red.png"], ["Green", "Cube", "//src/graphics/green.png"], ["Black", "Spiked", "//src/graphics/black.png"], ["Cyan", "Sphere", "//src/graphics/cyan.png"], - ["Purple", "Pentagon", "//src/graphics/purple.png"], - ["Yellow", "Cylinder", "//src/graphics/yellow.png"], - ["White", "Tubes Trio", "//src/graphics/white.png"], + ["Purple", "Sphere Double", "//src/graphics/purple.png"], + ["Yellow", "Triangle Alt", "//src/graphics/yellow.png"], + ["White", "Cone Inverted", "//src/graphics/white.png"], ] +# Code to render a preview of all types +# bottles = [["Red", type, f"//types/{type}.png"] for type in models] + +# Code for prototyping speedup +# bpy.data.scenes["Base"].cycles.samples = 1024 + # Set active scene so the highlights/shadows isn't accidentally rendered bpy.context.window.scene = bpy.data.scenes["Base"] diff --git a/src/changelog.txt b/src/changelog.txt index 5985346..2fd88dd 100644 --- a/src/changelog.txt +++ b/src/changelog.txt @@ -3,8 +3,5 @@ Version: 0.2.0 Changes: - Renamed mod to Colour Blind Friendly Science Packs - Scaled to better match sizes of the items. - - Added faux shading. - - Fixed mesh issues with green and yellow sciences. - - Made purple consistent with the other sciences. - - Added base for white scinece. - - Made black science darker. + - Added faux shading made the colours more vibrant. + - Redesigned production, utility and space science to more distinct and consistent shapes. diff --git a/src/graphics/black.png b/src/graphics/black.png index a6ede23..191e49d 100644 Binary files a/src/graphics/black.png and b/src/graphics/black.png differ diff --git a/src/graphics/cyan.png b/src/graphics/cyan.png index d4d20d6..e1ef99a 100644 Binary files a/src/graphics/cyan.png and b/src/graphics/cyan.png differ diff --git a/src/graphics/green.png b/src/graphics/green.png index 24b36ea..f540539 100644 Binary files a/src/graphics/green.png and b/src/graphics/green.png differ diff --git a/src/graphics/purple.png b/src/graphics/purple.png index a78af4f..176171e 100644 Binary files a/src/graphics/purple.png and b/src/graphics/purple.png differ diff --git a/src/graphics/red.png b/src/graphics/red.png index 8277a55..8f27ec0 100644 Binary files a/src/graphics/red.png and b/src/graphics/red.png differ diff --git a/src/graphics/white.png b/src/graphics/white.png index 337a81f..c47fb1b 100644 Binary files a/src/graphics/white.png and b/src/graphics/white.png differ diff --git a/src/graphics/yellow.png b/src/graphics/yellow.png index 4b64ab5..21e9cc8 100644 Binary files a/src/graphics/yellow.png and b/src/graphics/yellow.png differ