Fix everything that didnt pass tests / checks

* Fix non-compiling code found by linting

* Fix non fatal linting errors

examples/generate_individual_assets.py

@@ -290,14 +290,14 @@ def main(args):
         factories += [f.stem for f in Path('infinigen/assets/materials').iterdir()]
         factories.remove('ALL_MATERIALS')
 
-    for factory in factories:
-        fac_path = path / factory
+    for fac in factories:
+        fac_path = path / fac
         if fac_path.exists() and args.skip_existing:
             continue
         fac_path.mkdir(exist_ok=True)
         for idx in range(args.n_images):
             try:
-                build_scene(fac_path, idx, factory, args)
+                build_scene(fac_path, idx, fac, args)
             except Exception as e:
                 print(e)
                 continue

infinigen/assets/creatures/insects/utils/geom_utils.py

@@ -7,11 +7,14 @@
 import bpy
 import mathutils
 from numpy.random import uniform, normal, randint
+
 from infinigen.core.nodes.node_wrangler import Nodes, NodeWrangler
 from infinigen.core.nodes import node_utils
 from infinigen.core.nodes.color import color_category
 from infinigen.core import surface
 
+from .shader_utils import nodegroup_add_noise, nodegroup_color_noise
+
 @node_utils.to_nodegroup('nodegroup_symmetric_clone', singleton=False, type='GeometryNodeTree')
 def nodegroup_symmetric_clone(nw: NodeWrangler):
     # Code generated using version 2.4.3 of the node_transpiler

infinigen/assets/creatures/parts/head.py

@@ -491,51 +491,6 @@ def make_part(self, params):
         tag_object(part.obj, 'carnivore_jaw')
         return part
 
-@node_utils.to_nodegroup('nodegroup_fish_head', singleton=True, type='GeometryNodeTree')
-def nodegroup_fish_head(nw: NodeWrangler):
-    # Code generated using version 2.4.3 of the node_transpiler
-
-    group_input = nw.new_node(Nodes.GroupInput,
-        expose_input=[('NodeSocketVector', 'length_rad1_rad2', (0.51, 0.27, 0.12)),
-            ('NodeSocketVector', 'angles_deg', (7.0, -18.36, 0.0)),
-            ('NodeSocketFloat', 'aspect', 0.56),
-            ('NodeSocketFloat', 'fullness', 1.96),
-            ('NodeSocketVector', 'eye_coord', (0.5, 0.0, 1.0)),
-            ('NodeSocketFloatDistance', 'eye_radius', 0.05)])
-
-    eyeball = nw.new_node(nodegroup_eyeball().name,
-        input_kwargs={'Radius': group_input.outputs["eye_radius"]})
-
-    simple_tube_v2 = nw.new_node(nodegroup_simple_tube_v2().name,
-        input_kwargs={'length_rad1_rad2': group_input.outputs["length_rad1_rad2"], 'angles_deg': group_input.outputs["angles_deg"], 'aspect': group_input.outputs["aspect"], 'fullness': group_input.outputs["fullness"]})
-
-    eyesockets = nw.new_node(nodegroup_eye_sockets().name,
-        input_kwargs={'Eyeball': eyeball, 'Skin Mesh': simple_tube_v2.outputs["Geometry"], 'Skeleton Curve': simple_tube_v2.outputs["Skeleton Curve"], 'Base Mesh': simple_tube_v2.outputs["Geometry"], 'Length/Yaw/Rad': group_input.outputs["eye_coord"]})
-
-    group_output = nw.new_node(Nodes.GroupOutput,
-        input_kwargs={'Geometry': eyesockets.outputs["Geometry"], 'Skeleton Curve': simple_tube_v2.outputs["Skeleton Curve"], 'LeftEye': eyesockets.outputs["LeftEye"], 'RightEye': eyesockets.outputs["RightEye"]})
-
-class FishHead(PartFactory):
-
-    tags = ['head']
-
-    def sample_params(self):
-        return {
-            'length_rad1_rad2': (0.51, 0.27, 0.12),
-            'angles_deg': (7.0, -18.36, 0.0),
-            'aspect': 0.56,
-            'fullness': 1.96,
-            'eye_coord': (0.5, 0.0, 1.0),
-            'eye_radius': 0.0
-        }
-
-    def make_part(self, params):
-        part = part_util.nodegroup_to_part(nodegroup_fish_head, params)
-        part.iks = {1.0: IKParams('head', rotation_weight=0.1, chain_parts=2)}
-        part.settings['rig_extras'] = True
-        tag_object(part.obj, 'fish_head')
-        return part
-
 @node_utils.to_nodegroup('nodegroup_flying_bird_head', singleton=True, type='GeometryNodeTree')
 def nodegroup_flying_bird_head(nw: NodeWrangler):
     # Code generated using version 2.4.3 of the node_transpiler

infinigen/assets/creatures/reptile.py

@@ -391,7 +391,7 @@ def chameleon_postprocessing(body_parts, extras, params):
     body = body_parts + get_extras('BodyExtra')
     main_template.apply(body)
 
-    chameleon_eye.apply(get_extras('Eye'))
+    #chameleon_eye.apply(get_extras('Eye'))
 
 @gin.configurable
 class LizardFactory(AssetFactory):
@@ -410,8 +410,6 @@ def create_asset(self, i, animate=False, rigging=False, cloth=False, **kwargs):
             postprocess_func=reptile_postprocessing, adapt_mode='remesh', rigging=rigging, **kwargs)
         if animate and arma is not None:
             pass 
-        if simulate:
-            pass
         else:
             joined = butil.join_objects([joined] + extras)
 

infinigen/assets/leaves/__init__.py

@@ -1,4 +1,4 @@
-from .leaf import BerryFactory, LeafFactory
+from .leaf import LeafFactory
 from .leaf_broadleaf import LeafFactoryBroadleaf
 from .leaf_ginko import LeafFactoryGinko
 from .leaf_maple import LeafFactoryMaple

infinigen/assets/leaves/leaf.py

@@ -87,7 +87,8 @@ def create_asset(self, **params) -> bpy.types.Object:
         butil.apply_transform(obj)
 
         return obj
-
+
+'''
 class BerryFactory(AssetFactory):
 
     def __init__(self, factory_seed, genome, coarse=False):
@@ -116,6 +117,7 @@ def create_asset(self, **params) -> bpy.types.Object:
         tag_object(obj, 'leaf')
 
         return obj
+'''
 
 '''
 def init_berries(n_leaves=5, im_mat=None, **leaf_kargs):

infinigen/assets/materials/bark.py

@@ -5,6 +5,7 @@
 
 import os, sys
 import numpy as np
+from numpy.random import uniform as U, normal as N
 import math as ma
 from infinigen.assets.materials.utils.surface_utils import clip, sample_range, sample_ratio, sample_color, geo_voronoi_noise
 import bpy

infinigen/assets/materials/bird.py

@@ -457,6 +457,8 @@ def apply(objs, shader_kwargs={}, **kwargs):
     else:
         kind = 'duck'
     shader_kwargs['kind'] = kind
+    if not isinstance(objs, list):
+        objs = [objs]
     for obj in objs:
         if "Tail" in obj.name:
             shader_kwargs['tail'] = True

infinigen/assets/materials/chunkyrock.py

@@ -47,8 +47,8 @@ def shader_rocks(nw, rand=True, **input_kwargs):
         input_kwargs={'Fac': noise_texture_1.outputs["Fac"], 'Color1': (0.0, 0.0, 0.0, 1.0), 'Color2': (0.01, 0.024, 0.0283, 1.0)})
 
     if rand:
-        sample_color(rock_color1.inputs["Color1"].default_value)
-        sample_color(rock_color1.inputs["Color2"].default_value)
+        sample_color(rock_color1.inputs[6].default_value)
+        sample_color(rock_color1.inputs[7].default_value)
 
     noise_texture_2 = nw.new_node(Nodes.NoiseTexture,
         input_kwargs={'Vector': mapping, 'Detail': 15.0})
@@ -57,8 +57,8 @@ def shader_rocks(nw, rand=True, **input_kwargs):
         input_kwargs={'Fac': noise_texture_2.outputs["Fac"], 'Color1': (0.0, 0.0, 0.0, 1.0), 'Color2': (0.0694, 0.1221, 0.0693, 1.0)})
 
     if rand:
-        sample_color(rock_color2.inputs["Color1"].default_value)
-        sample_color(rock_color2.inputs["Color2"].default_value)
+        sample_color(rock_color2.inputs[6].default_value)
+        sample_color(rock_color2.inputs[7].default_value)
 
     mix_1 = nw.new_node(Nodes.MixRGB,
         input_kwargs={'Fac': colorramp_3.outputs["Color"], 'Color1': rock_color1, 'Color2': rock_color2})

infinigen/assets/materials/three_color_spots.py

@@ -24,7 +24,7 @@ def shader_spot(nw, rand=True, **input_kwargs):
     mix = nw.new_node(Nodes.MixRGB,
         input_kwargs={'Fac': 0.7, 'Color1': noise_texture.outputs["Color"], 'Color2': texture_coordinate.outputs["Object"]})
     if rand:
-        mix.inputs["Fac"].default_value = sample_range(0.5, 0.9)
+        mix.inputs["Factor"].default_value = sample_range(0.5, 0.9)
 
     scale = nw.new_node(Nodes.Value)
     scale.outputs["Value"].default_value = input_kwargs['scale'] if 'scale' in input_kwargs else 2

infinigen/assets/materials/two_color_spots.py

@@ -50,7 +50,7 @@ def geo_two_color_spots(nw, rand=True, **input_kwargs):
     mix = nw.new_node(Nodes.MixRGB,
         input_kwargs={'Color1': noise_texture.outputs["Color"], 'Color2': vector_math.outputs["Vector"]})
     if rand:
-        mix.inputs["Fac"].default_value = sample_range(0.5, 0.9)
+        mix.inputs["Factor"].default_value = sample_range(0.5, 0.9)
 
     voronoi_texture = nw.new_node(Nodes.VoronoiTexture,
         input_kwargs={'Vector': mix},

infinigen/assets/rocks/pile.py

@@ -9,15 +9,16 @@
 import numpy as np
 from numpy.random import uniform
 
-from infinigen.assets.boulder import BoulderFactory
+from infinigen.assets.rocks.boulder import BoulderFactory
 from infinigen.assets.utils.physics import free_fall
 from infinigen.core.placement.detail import remesh_with_attrs
 from infinigen.core.placement.factory import AssetFactory
 import infinigen.core.util.blender as butil
 from infinigen.assets.utils.decorate import join_objects, multi_res, toggle_hide
 from infinigen.assets.utils.draw import surface_from_func
 from infinigen.core.util.blender import deep_clone_obj
-from infinigen.assets.utils.tag import tag_object, tag_nodegroup
+from infinigen.assets.utils.tag import tag_object
+from infinigen.core.util.random import log_uniform
 
 
 class BoulderPileFactory(AssetFactory):

infinigen/assets/trees/utils/materials.py

@@ -90,7 +90,7 @@ def create_leaf_material(src_hue, glow=False):
     nt.nodes.new('ShaderNodeEmission')
     em = nt.nodes.get('Emission')
     em.inputs.get('Strength').default_value = 1
-    em.inputs.get('Color').default_value = (*utils.colorsys.hsv_to_rgb(src_hue + np.random.randn() * .1, 1, 1), 1)
+    em.inputs.get('Color').default_value = (*colorsys.hsv_to_rgb(src_hue + np.random.randn() * .1, 1, 1), 1)
     new_link(nt, em, 'Emission', out_node, 'Surface')
 
   else:

infinigen/assets/trees/utils/mesh.py

@@ -271,33 +271,6 @@ def get_visible_vertices(cam, vertices, co2D=None, limit=0.02):
 
   return co2D, is_visible, in_frame
 
-
-def obj_point_sampling(cam, obj, n=300, start_frame=0, end_frame=10):
-  # Sample points distributed over mesh
-  geometry_point_distribute(obj)
-
-  dgraph = C.evaluated_depsgraph_get()
-  obj_eval = obj.evaluated_get(dgraph)
-  subset = subsample_vertices(obj_eval.data.vertices, n)
-
-  # Get point locations for all frames
-  all_pts = get_coords_clip(obj, start_frame, end_frame, subset)
-
-  # Remove geometry node modifier
-  obj.modifiers.remove(obj.modifiers[-1])
-
-  # Get visibility info for all points at each frame
-  all_2d, vis, infr = [], [], []
-  for i, pts in enumerate(all_pts):
-    C.scene.frame_set(i + start_frame)
-    co2D, is_visible, in_frame = get_visible_vertices(cam, pts)
-    all_2d += [co2D]
-    vis += [is_visible]
-    infr += [in_frame]
-
-  return all_pts, np.stack(all_2d, 0), np.stack(vis, 0), np.stack(infr, 0)
-
-
 def sanity_check_viz(all_pts, is_visible, in_frame, frame_idx=0):
   C.scene.frame_set(frame_idx)
   for i in range(all_pts.shape[1]):

infinigen/assets/tropic_plants/leaf_banana_tree.py

@@ -13,7 +13,14 @@
 from infinigen.core.placement.factory import AssetFactory
 import numpy as np
 from infinigen.core.nodes.color import hsv2rgba
-from infinigen.assets.tropic_plants.tropic_plant_utils import *
+from infinigen.assets.tropic_plants.tropic_plant_utils import (
+    nodegroup_nodegroup_leaf_gen,
+    nodegroup_nodegroup_leaf_rotate_x,
+    nodegroup_nodegroup_leaf_shader,
+    nodegroup_nodegroup_move_to_origin,
+    nodegroup_nodegroup_sub_vein,
+    shader_stem_material
+)
 from infinigen.core.util import blender as butil
 from infinigen.assets.utils.tag import tag_object, tag_nodegroup
 

infinigen/assets/tropic_plants/leaf_palm_plant.py

@@ -6,9 +6,21 @@
 
 import bpy
 import mathutils
-from numpy.random import uniform
-from infinigen.assets.tropic_plants.tropic_plant_utils import *
+import numpy as np
+from numpy.random import uniform, normal, randint
+from infinigen.assets.tropic_plants.tropic_plant_utils import (
+    nodegroup_nodegroup_leaf_gen,
+    nodegroup_nodegroup_leaf_rotate_x,
+    nodegroup_nodegroup_leaf_shader,
+    nodegroup_nodegroup_move_to_origin,
+    nodegroup_nodegroup_sub_vein,
+    hsv2rgba,
+    shader_stem_material,
+)
+from infinigen.core.placement.factory import AssetFactory
+from infinigen.core.nodes import Nodes, NodeWrangler, node_utils
 from infinigen.core.util import blender as butil
+from infinigen.core import surface
 
 
 @node_utils.to_nodegroup('nodegroup_nodegroup_apply_wave', singleton=False, type='GeometryNodeTree')

infinigen/assets/tropic_plants/leaf_palm_tree.py

@@ -3,8 +3,24 @@
 
 # Authors: Beining Han
 
-
-from infinigen.assets.tropic_plants.tropic_plant_utils import *
+import bpy
+
+import numpy as np
+from numpy.random import uniform, normal, randint
+
+from infinigen.core.nodes import Nodes, NodeWrangler, node_utils
+from infinigen.core.nodes.color import hsv2rgba
+from infinigen.core import surface
+from infinigen.core.placement.factory import AssetFactory
+
+from infinigen.assets.tropic_plants.tropic_plant_utils import (
+    nodegroup_nodegroup_leaf_shader, 
+    nodegroup_nodegroup_sub_vein,
+    nodegroup_nodegroup_leaf_gen,
+    nodegroup_nodegroup_move_to_origin,
+    nodegroup_nodegroup_leaf_rotate_x, 
+    shader_stem_material
+)
 from infinigen.assets.utils.tag import tag_object, tag_nodegroup
 
 @node_utils.to_nodegroup('nodegroup_nodegroup_apply_wave', singleton=False, type='GeometryNodeTree')

infinigen/assets/weather/cloud/cloud.py

@@ -15,6 +15,7 @@
 from infinigen.core.nodes import node_utils
 from infinigen.core import surface
 
+from infinigen.assets.lighting import sky_lighting
 from infinigen.assets.weather.cloud.node import geometry_func, shader_material
 from infinigen.assets.weather.cloud.node import scatter_func
 

infinigen/assets/weather/cloud/node.py

@@ -271,15 +271,6 @@ def cloud_geometry_node(
                 'operation': 'GREATER_THAN',
             },
         )
-
-        if points_only:
-            group_output = nw.new_node(
-                Nodes.GroupOutput,
-                input_kwargs={
-                    'Geometry': separate_geometry,
-                },
-            )
-            return
 
         separate_geometry = nw.new_node(
             Nodes.SeparateGeometry,