From: hgn <hgodden00@gmail.com>
Date: Tue, 6 Sep 2022 14:12:44 +0000 (+0100)
Subject: update model format
X-Git-Url: https://harrygodden.com/git/?a=commitdiff_plain;h=d045af680c6b8ca267a7aded69e2e510e659d2ab;p=carveJwlIkooP6JGAAIwe30JlM.git

update model format
---

diff --git a/blender_export.py b/blender_export.py
index 57bf366..eec7a49 100644
--- a/blender_export.py
+++ b/blender_export.py
@@ -20,8 +20,10 @@ class mdl_vert(Structure):
    _pack_ = 1
    _fields_ = [("co",c_float*3),
                ("norm",c_float*3),
-               ("colour",c_float*4),
-               ("uv",c_float*2)]
+               ("uv",c_float*2),
+               ("colour",c_uint8*4),
+               ("weights",c_uint16*4),
+               ("groups",c_uint8*4)]
 
 class mdl_submesh(Structure):
    _pack_ = 1
@@ -45,6 +47,7 @@ class mdl_node(Structure):
                ("submesh_count",c_uint32),
                ("classtype",c_uint32),
                ("offset",c_uint32),
+               ("children",c_uint32),
                ("pstr_name",c_uint32)]
 
 class mdl_header(Structure):
@@ -68,7 +71,10 @@ class mdl_header(Structure):
                ("node_offset",c_uint32),
 
                ("strings_offset",c_uint32),
-               ("entdata_offset",c_uint32)
+               ("entdata_offset",c_uint32),
+
+               ("anim_count",c_uint32),
+               ("anim_offset",c_uint32)
                ]
 
 # Entity types
@@ -116,11 +122,24 @@ class classtype_route(Structure):
                ("id_start",c_uint32),
                ("colour",c_float*3)]
 
+class classtype_skin(Structure):
+   _pack_ = 1
+   _fields_ = [("skeleton",c_uint32)]
+
+class classtype_skeleton(Structure):
+   _pack_ = 1
+   _fields_ = [("anim_start",c_uint32),
+               ("anim_count",c_uint32)]
+
+class classtype_bone(Structure):
+   _pack_ = 1
+   _fields_ = [("deform",c_uint32)]
+
 # Exporter
 # ==============================================================================
 
-def write_model(name):
-   print( F"Create mode {name}" )
+def write_model(collection_name):
+   print( F"Model graph | Create mode '{collection_name}'" )
 
    header = mdl_header()
    header.identifier = 0xABCD0000
@@ -171,6 +190,7 @@ def write_model(name):
       return material_cache[mat.name]
 
    # Create root or empty node and materials
+   # this is to designate id 0 as 'NULL'
    #
    none_material = c_uint32(69)
    none_material.name = ""
@@ -197,157 +217,147 @@ def write_model(name):
    # Do exporting
    #
    print( "  assigning ids" )
-   collection = bpy.data.collections[name]
+   collection = bpy.data.collections[collection_name]
+
+   # Scene graph
+   # ==========================================
    
-   header.node_count = 1
-   for obj in collection.all_objects:
-      obj.cv_data.uid = header.node_count
+   header.node_count = 0
+   def _uid():
+      nonlocal header
+      uid = header.node_count
       header.node_count += 1
+      return uid
 
-   print( "  compiling data" )
-   for obj in collection.all_objects:
-      print( F"  [{obj.cv_data.uid}/{header.node_count-1}] {obj.name}" )
+   print( "  creating scene graph" )
+   graph = {"obj": None, "depth": 0, "children": [], "uid": _uid()}
+   graph_lookup = {} # object can lookup its graph def here
 
-      node = mdl_node()
-      node.co[0] =  obj.location[0]
-      node.co[1] =  obj.location[2]
-      node.co[2] = -obj.location[1]
-      
-      # Convert rotation quat to our space type
-      quat = obj.matrix_world.to_quaternion()
-      node.q[0] =  quat[1]
-      node.q[1] =  quat[3]
-      node.q[2] = -quat[2]
-      node.q[3] =  quat[0]
-      
-      node.s[0] = obj.scale[0]
-      node.s[1] = obj.scale[2]
-      node.s[2] = obj.scale[1]
-      node.pstr_name = emplace_string( obj.name )
-
-      # Process entity data
-      #
-      node.offset = entdata_length
-      classtype = obj.cv_data.classtype
-
-      if classtype == 'k_classtype_gate':
-         node.classtype = 1
-         entdata_length += sizeof( classtype_gate )
-
-         gate = classtype_gate()
-         gate.target = 0
-         if obj.cv_data.target != None:
-            gate.target = obj.cv_data.target.cv_data.uid
+   for obj in collection.all_objects:
+      if not obj.parent:
 
-         if obj.type == 'MESH':
-            gate.dims[0] = obj.data.cv_data.v0[0]
-            gate.dims[1] = obj.data.cv_data.v0[1]
-            gate.dims[2] = obj.data.cv_data.v0[2]
-         else:
-            gate.dims[0] = obj.cv_data.v0[0]
-            gate.dims[1] = obj.cv_data.v0[1]
-            gate.dims[2] = obj.cv_data.v0[2]
+         def _extend( p, n, d ):
+            uid = _uid()
+            tree = {"obj":n, "depth": d, "children":[], "uid": uid}
+            n.cv_data.uid = uid
 
-         entdata_buffer += [gate]
+            if n.type == 'ARMATURE':
+               tree["bones"] = [None] # None is the root transform
 
-      elif classtype == 'k_classtype_block':
-         node.classtype = 2
-         entdata_length += sizeof( classtype_block )
+               def _extendb( p, n, d ):
+                  nonlocal tree
 
-         source = obj.data.cv_data
+                  btree = {"bone":n, "depth": d, "children":[], "uid": _uid()}
+                  for c in n.children:
+                     _extendb( btree, c, d+1 )
 
-         block = classtype_block()
-         block.bbx[0][0] =  source.v0[0]
-         block.bbx[0][1] =  source.v0[2]
-         block.bbx[0][2] = -source.v1[1]
+                  btree['deform'] = n.use_deform
+                  p['children'] += [btree]
 
-         block.bbx[1][0] =  source.v1[0]
-         block.bbx[1][1] =  source.v1[2]
-         block.bbx[1][2] = -source.v0[1]
-         entdata_buffer += [block]
+                  if n.use_deform:
+                     tree["bones"] += [n.name]
 
-      elif classtype == 'k_classtype_spawn':
-         node.classtype = 3
+               for b in n.data.bones:
+                  if not b.parent:
+                     _extendb( tree, b, d+1 )
 
-      elif classtype == 'k_classtype_water':
-         node.classtype = 4
-      elif classtype == 'k_classtype_car_path':
-         node.classtype = 5
-         entdata_length += sizeof( classtype_car_path )
+            for obj1 in n.children:
+               _extend( tree, obj1, d+1 )
 
-         pn = classtype_car_path()
-         pn.target = 0
-         pn.target1 = 0
+            p["children"] += [tree]
+            graph_lookup[n] = tree
 
-         if obj.cv_data.target != None: 
-            pn.target = obj.cv_data.target.cv_data.uid
-         if obj.cv_data.target1 != None: 
-            pn.target1 = obj.cv_data.target1.cv_data.uid
+         _extend( graph, obj, 1 )
 
-         entdata_buffer += [pn]
-      elif obj.is_instancer:
-         target = obj.instance_collection
 
-         node.classtype = 6
-         entdata_length += sizeof( classtype_instance )
+   def _graph_iter(p):
+      for c in p['children']:
+         yield c
+         yield from _graph_iter(c)
 
-         inst = classtype_instance()
-         inst.pstr_file = emplace_string( F"models/{target.name}.mdl" )
-         entdata_buffer += [inst]
-      elif classtype == 'k_classtype_capsule':
-         node.classtype = 7
-      elif classtype == 'k_classtype_route_node':
-         node.classtype = 8
-         entdata_length += sizeof( classtype_route_node )
+   it = _graph_iter(graph)
 
-         rn = classtype_route_node()
-         if obj.cv_data.target != None: 
-            rn.target = obj.cv_data.target.cv_data.uid
-         if obj.cv_data.target1 != None: 
-            rn.target1 = obj.cv_data.target1.cv_data.uid
+   root.children = len(graph['children'])
 
-         entdata_buffer += [rn]
-      elif classtype == 'k_classtype_route':
-         node.classtype = 9
-         entdata_length += sizeof( classtype_route )
-         r = classtype_route()
-         r.pstr_name = emplace_string("not-implemented")
-         r.colour[0] = obj.cv_data.colour[0]
-         r.colour[1] = obj.cv_data.colour[1]
-         r.colour[2] = obj.cv_data.colour[2]
+   # Compile
+   # ==============================================
+   it = _graph_iter(graph)
+   print( "  compiling data" )
+   for node_def in it:
+      if 'obj' in node_def:
+         obj = node_def['obj']
+         objt = obj.type
+         objco = obj.location
+      elif 'bone' in node_def:
+         obj = node_def['bone']
+         objt = 'BONE'
+         objco = obj.head_local
+
+      depth = node_def['depth']
+      uid = node_def['uid']
 
-         if obj.cv_data.target != None: 
-            r.id_start = obj.cv_data.target.cv_data.uid
+      node = mdl_node()
+      node.co[0] =  objco[0]
+      node.co[1] =  objco[2]
+      node.co[2] = -objco[1]
+      
+      # Convert rotation quat to our space type
+      quat = obj.matrix_local.to_quaternion()
+      node.q[0] =  quat[1]
+      node.q[1] =  quat[3]
+      node.q[2] = -quat[2]
+      node.q[3] =  quat[0]
+      
+      if objt == 'BONE':
+         node.s[0] =  obj.tail[0]
+         node.s[1] =  obj.tail[2]
+         node.s[2] = -obj.tail[1]
+      else:
+         node.s[0] = obj.scale[0]
+         node.s[1] = obj.scale[2]
+         node.s[2] = obj.scale[1]
 
-         entdata_buffer += [r]
+      node.pstr_name = emplace_string( obj.name )
 
-      # classtype == 'k_classtype_none':
+      if objt == 'BONE':
+         classtype = 'k_classtype_bone'
+      elif objt == 'ARMATURE':
+         classtype = 'k_classtype_skeleton'
       else:
-         node.classtype = 0
-         node.offset = 0
+         classtype = obj.cv_data.classtype
+      
+      # Process type: MESH
+      # =================================================================
+      #
 
-      # Process meshes
+      # Dont use the cache if we have modifiers that affect the normals
       #
-      node.submesh_start = header.submesh_count
-      node.submesh_count = 0
+      compile_mesh = False
+      if objt == 'MESH':
+         armature_def = None
+         compile_mesh = True
+         can_use_cache = True
 
-      if obj.type == 'MESH':
-         default_mat = c_uint32(69)
-         default_mat.name = ""
-         
-         # Dont use the cache if we have modifiers that affect the normals
-         #
-         use_cache = True
          for mod in obj.modifiers:
-            if mod.type == 'DATA_TRANSFER':
-               use_cache = False
+            if mod.type == 'DATA_TRANSFER' or mod.type == 'SHRINKWRAP':
+               can_use_cache = False
+
+            if mod.type == 'ARMATURE':
+               classtype = 'k_classtype_skin'
+               armature_def = graph_lookup[mod.object]
 
-         if use_cache and obj.data.name in mesh_cache:
+         if can_use_cache and obj.data.name in mesh_cache:
             ref = mesh_cache[obj.data.name]
             node.submesh_start = ref.submesh_start
             node.submesh_count = ref.submesh_count
-            node_buffer += [node]
-            continue
+            compile_mesh = False
+
+      if compile_mesh:
+         node.submesh_start = header.submesh_count
+         node.submesh_count = 0
+
+         default_mat = c_uint32(69)
+         default_mat.name = ""
 
          dgraph = bpy.context.evaluated_depsgraph_get()
          data = obj.evaluated_get(dgraph).data
@@ -380,15 +390,47 @@ def write_model(name):
                for j in range(3):
                   vert = data.vertices[tri.vertices[j]]
                   li = tri.loops[j]
+                  vi = data.loops[li].vertex_index
 
                   co = vert.co
                   norm = data.loops[li].normal
                   uv = (0,0)
-                  colour = (1,1,1,1)
+                  colour = (255,255,255,255)
+                  groups = [0,0,0,0]
+                  weights = [0,0,0,0]
+
                   if data.uv_layers:
                      uv = data.uv_layers.active.data[li].uv
+
                   if data.vertex_colors:
                      colour = data.vertex_colors.active.data[li].color
+                     colour = (int(colour[0]*255.0),\
+                               int(colour[1]*255.0),\
+                               int(colour[2]*255.0),\
+                               int(colour[3]*255.0))
+                  
+                  # WEight groups
+                  #
+                  if armature_def:
+                     weight_groups = sorted( data.vertices[vi].groups, key = \
+                                             lambda a: a.weight, reverse=True )
+                     tot = 0.0
+                     for ml in range(3):
+                        if len(weight_groups) > ml:
+                           g = weight_groups[ml]
+                           name = obj.vertex_groups[g.group].name
+                           weight = g.weight
+
+                           weights[ml] = weight
+                           groups[ml] = armature_def['bones'].index(name)
+                           tot += weight
+                  
+                     if len(weight_groups) > 0:
+                        inv_norm = (1.0/tot) * 65535.0
+                        for ml in range(3):
+                           weights[ml] = int( weights[ml] * inv_norm )
+                           weights[ml] = min( weights[ml], 65535 )
+                           weights[ml] = max( weights[ml], 0 )
 
                   TOLERENCE = 4
                   m = float(10**TOLERENCE)
@@ -401,10 +443,18 @@ def write_model(name):
                          int(norm[2]*m+0.5),\
                          int(uv[0]*m+0.5),\
                          int(uv[1]*m+0.5),\
-                         int(colour[0]*m+0.5),\
-                         int(colour[1]*m+0.5),\
-                         int(colour[2]*m+0.5),\
-                         int(colour[3]*m+0.5))
+                         colour[0],\
+                         colour[1],\
+                         colour[2],\
+                         colour[3],\
+                         weights[0],\
+                         weights[1],\
+                         weights[2],\
+                         weights[3],\
+                         groups[0],\
+                         groups[1],\
+                         groups[2],\
+                         groups[3])
 
                   if key in boffa:
                      indice_buffer += [boffa[key]]
@@ -428,6 +478,15 @@ def write_model(name):
                      v.colour[1] = colour[1]
                      v.colour[2] = colour[2]
                      v.colour[3] = colour[3]
+                     v.weights[0] = weights[0]
+                     v.weights[1] = weights[1]
+                     v.weights[2] = weights[2]
+                     v.weights[3] = weights[3]
+                     v.groups[0] = groups[0]
+                     v.groups[1] = groups[1]
+                     v.groups[2] = groups[2]
+                     v.groups[3] = groups[3]
+
                      vertex_buffer += [v]
 
                      for i in range(3):
@@ -448,6 +507,164 @@ def write_model(name):
             header.indice_count += sm.indice_count
 
          mesh_cache[obj.data.name] = node
+
+      # Process entity data
+      # ==================================================================
+      node.offset = entdata_length
+
+      if classtype != 'k_classtype_none':
+         disptype = classtype
+      else:
+         disptype = objt
+
+      s000 = F"  [{uid: 3}/{header.node_count-1}]" + " |"*(depth-1)
+      s001 = F" L {obj.name}"
+      s002 = s000+s001
+      s003 = F"{disptype}"
+      s004 = ""
+      if classtype == 'k_classtype_skin':
+         s004 = F"-> {armature_def['obj'].cv_data.uid}"
+
+      scmp = F"{s002:<32} {s003:<16} {s004}"
+      print( scmp )
+      
+      if classtype == 'k_classtype_INSTANCE' or \
+         classtype == 'k_classtype_BONE' or \
+         classtype == 'k_classtype_SKELETON' or \
+         classtype == 'k_classtype_SKIN':
+         print( "ERROR: user classtype cannot be _INSTANCE or _BONE" )
+         node.classtype = 0
+         node.offset = 0
+
+      elif classtype == 'k_classtype_skin':
+         node.classtype = 12
+
+         armature = armature_def['obj']
+         entdata_length += sizeof( classtype_skin )
+
+         skin = classtype_skin()
+         skin.skeleton = armature.cv_data.uid
+         entdata_buffer += [skin]
+      
+      elif classtype == 'k_classtype_skeleton':
+         node.classtype = 11
+         entdata_length += sizeof( classtype_skeleton )
+
+         skeleton = classtype_skeleton()
+         skeleton.anim_start = 0
+         skeleton.anim_count = 0
+
+         entdata_buffer += [skeleton]
+
+      elif classtype == 'k_classtype_bone':
+         node.classtype = 10
+         entdata_length += sizeof( classtype_bone )
+         
+         bone = classtype_bone()
+         bone.use_deform = node_def['deform']
+         entdata_buffer += [bone]
+
+      elif classtype == 'k_classtype_gate':
+         node.classtype = 1
+         entdata_length += sizeof( classtype_gate )
+
+         gate = classtype_gate()
+         gate.target = 0
+         if obj.cv_data.target != None:
+            gate.target = obj.cv_data.target.cv_data.uid
+
+         if obj.type == 'MESH':
+            gate.dims[0] = obj.data.cv_data.v0[0]
+            gate.dims[1] = obj.data.cv_data.v0[1]
+            gate.dims[2] = obj.data.cv_data.v0[2]
+         else:
+            gate.dims[0] = obj.cv_data.v0[0]
+            gate.dims[1] = obj.cv_data.v0[1]
+            gate.dims[2] = obj.cv_data.v0[2]
+
+         entdata_buffer += [gate]
+
+      elif classtype == 'k_classtype_block':
+         node.classtype = 2
+         entdata_length += sizeof( classtype_block )
+
+         source = obj.data.cv_data
+
+         block = classtype_block()
+         block.bbx[0][0] =  source.v0[0]
+         block.bbx[0][1] =  source.v0[2]
+         block.bbx[0][2] = -source.v1[1]
+
+         block.bbx[1][0] =  source.v1[0]
+         block.bbx[1][1] =  source.v1[2]
+         block.bbx[1][2] = -source.v0[1]
+         entdata_buffer += [block]
+
+      elif classtype == 'k_classtype_spawn':
+         node.classtype = 3
+
+      elif classtype == 'k_classtype_water':
+         node.classtype = 4
+
+      elif classtype == 'k_classtype_car_path':
+         node.classtype = 5
+         entdata_length += sizeof( classtype_car_path )
+
+         pn = classtype_car_path()
+         pn.target = 0
+         pn.target1 = 0
+
+         if obj.cv_data.target != None: 
+            pn.target = obj.cv_data.target.cv_data.uid
+         if obj.cv_data.target1 != None: 
+            pn.target1 = obj.cv_data.target1.cv_data.uid
+
+         entdata_buffer += [pn]
+
+      elif obj.is_instancer:
+         target = obj.instance_collection
+
+         node.classtype = 6
+         entdata_length += sizeof( classtype_instance )
+
+         inst = classtype_instance()
+         inst.pstr_file = emplace_string( F"models/{target.name}.mdl" )
+         entdata_buffer += [inst]
+
+      elif classtype == 'k_classtype_capsule':
+         node.classtype = 7
+
+      elif classtype == 'k_classtype_route_node':
+         node.classtype = 8
+         entdata_length += sizeof( classtype_route_node )
+
+         rn = classtype_route_node()
+         if obj.cv_data.target != None: 
+            rn.target = obj.cv_data.target.cv_data.uid
+         if obj.cv_data.target1 != None: 
+            rn.target1 = obj.cv_data.target1.cv_data.uid
+
+         entdata_buffer += [rn]
+
+      elif classtype == 'k_classtype_route':
+         node.classtype = 9
+         entdata_length += sizeof( classtype_route )
+         r = classtype_route()
+         r.pstr_name = emplace_string("not-implemented")
+         r.colour[0] = obj.cv_data.colour[0]
+         r.colour[1] = obj.cv_data.colour[1]
+         r.colour[2] = obj.cv_data.colour[2]
+
+         if obj.cv_data.target != None: 
+            r.id_start = obj.cv_data.target.cv_data.uid
+
+         entdata_buffer += [r]
+
+      # classtype == 'k_classtype_none':
+      else:
+         node.classtype = 0
+         node.offset = 0
+
       node_buffer += [node]
 
    # Write data arrays
@@ -455,30 +672,39 @@ def write_model(name):
    print( "Writing data" )
    fpos = sizeof(header)
 
+   print( F"Nodes: {header.node_count}" )
    header.node_offset = fpos
    fpos += sizeof(mdl_node)*header.node_count
 
+   print( F"Submeshes: {header.submesh_count}" )
    header.submesh_offset = fpos
    fpos += sizeof(mdl_submesh)*header.submesh_count
 
+   print( F"Materials: {header.material_count}" )
    header.material_offset = fpos
    fpos += sizeof(mdl_material)*header.material_count
 
+   print( F"Entdata length: {entdata_length}" )
    header.entdata_offset = fpos
    fpos += entdata_length
-
+   
+   print( F"Vertex count: {header.vertex_count}" )
    header.vertex_offset = fpos
    fpos += sizeof(mdl_vert)*header.vertex_count
 
+   print( F"Indice count: {header.indice_count}" )
    header.indice_offset = fpos
    fpos += sizeof(c_uint32)*header.indice_count
-
+   
+   print( F"Strings length: {len(strings_buffer)}" )
    header.strings_offset = fpos
    fpos += len(strings_buffer)
 
    header.file_length = fpos
 
-   fp = open(F"/home/harry/Documents/carve/models_src/{name}.mdl", "wb")
+   path = F"/home/harry/Documents/carve/models_src/{collection_name}.mdl"
+   fp = open( path, "wb" )
+             
    fp.write( bytearray( header ) )
    
    for node in node_buffer:
@@ -496,7 +722,7 @@ def write_model(name):
    fp.write( strings_buffer )
    fp.close()
 
-   print( F"Completed {name}.mdl" )
+   print( F"Completed {collection_name}.mdl" )
 
 # Clicky clicky GUI
 # ------------------------------------------------------------------------------
@@ -828,11 +1054,18 @@ class CV_OBJ_SETTINGS(bpy.types.PropertyGroup):
       ('k_classtype_spawn', "k_classtype_spawn", "", 3),
       ('k_classtype_water', "k_classtype_water", "", 4),
       ('k_classtype_car_path', "k_classtype_car_path", "", 5),
+      ('k_classtype_INSTANCE', "","", 6 ),
       ('k_classtype_capsule', "k_classtype_capsule", "", 7 ),
       ('k_classtype_route_node', "k_classtype_route_node", "", 8 ),
-      ('k_classtype_route', "k_classtype_route", "", 9 )
+      ('k_classtype_route', "k_classtype_route", "", 9 ),
+      ('k_classtype_bone',"k_classtype_bone","",10),
+      ('k_classtype_SKELETON', "","", 11 ),
+      ('k_classtype_SKIN',"","",12)
       ])
 
+class CV_SCENE_SETTINGS(bpy.types.PropertyGroup):
+   use_hidden: bpy.props.BoolProperty( name="use hidden", default=False )
+
 class CV_OBJ_PANEL(bpy.types.Panel):
    bl_label="Entity Config"
    bl_idname="SCENE_PT_cv_entity"
@@ -883,11 +1116,14 @@ class CV_INTERFACE(bpy.types.Panel):
 
    def draw(_, context):
       layout = _.layout
+      layout.prop( context.scene.cv_data, "use_hidden")
       layout.operator( "carve.compile_all" )
 
 def test_compile():
-   for col in bpy.data.collections["export"].children:
-      write_model( col.name )
+   view_layer = bpy.context.view_layer
+   for col in view_layer.layer_collection.children["export"].children:
+      if not col.hide_viewport or bpy.context.scene.cv_data.use_hidden:
+         write_model( col.name )
 
 class CV_COMPILE(bpy.types.Operator):
    bl_idname="carve.compile_all"
@@ -902,7 +1138,7 @@ class CV_COMPILE(bpy.types.Operator):
       return {'FINISHED'}
 
 classes = [CV_OBJ_SETTINGS,CV_OBJ_PANEL,CV_COMPILE,CV_INTERFACE,\
-           CV_MESH_SETTINGS]
+           CV_MESH_SETTINGS, CV_SCENE_SETTINGS]
 
 def register():
    global cv_view_draw_handler
@@ -912,6 +1148,7 @@ def register():
 
    bpy.types.Object.cv_data = bpy.props.PointerProperty(type=CV_OBJ_SETTINGS)
    bpy.types.Mesh.cv_data = bpy.props.PointerProperty(type=CV_MESH_SETTINGS)
+   bpy.types.Scene.cv_data = bpy.props.PointerProperty(type=CV_SCENE_SETTINGS)
 
    cv_view_draw_handler = bpy.types.SpaceView3D.draw_handler_add(\
       cv_draw,(),'WINDOW','POST_VIEW')
diff --git a/common.h b/common.h
index 5e2f482..afa32fd 100644
--- a/common.h
+++ b/common.h
@@ -20,7 +20,9 @@ enum classtype
    k_classtype_instance = 6,
    k_classtype_capsule = 7,
    k_classtype_route_node = 8,
-   k_classtype_route = 9
+   k_classtype_route = 9,
+   k_classtype_bone = 10,
+   k_classtype_skeleton = 11
 };
 
 /* TODO: he needs a home somewhere */
diff --git a/main.c b/main.c
index 535205c..8c1ddef 100644
--- a/main.c
+++ b/main.c
@@ -20,7 +20,7 @@ static int lightedit = 0;
 static int sv_scene = 0;
 
 /* Components */
-#define SR_NETWORKED
+//#define SR_NETWORKED
 
 /* uncomment this to run the game without any graphics being drawn */
 //#define SR_NETWORK_TEST
@@ -119,6 +119,14 @@ void vg_start(void)
       .persistent = 1
    });
 
+   vg_convar_push( (struct vg_convar){
+      .name = "fcs",
+      .data = &fc_speed,
+      .data_type = k_convar_dtype_f32,
+      .opt_f32 = { .clamp = 0 },
+      .persistent = 1
+   });
+
    vg_convar_push( (struct vg_convar){
       .name = "ledit",
       .data = &lightedit,
@@ -290,7 +298,7 @@ static void render_main_game(void)
    {
       m4x4_projection( vg_pv, gpipeline.fov, 
             (float)vg_window_x / (float)vg_window_y, 
-            0.04f, 600.0f );
+            0.01f, 600.0f );
       m4x4_mul( vg_pv, world_4x4, vg_pv );
    }
    draw_player();
diff --git a/model.h b/model.h
index ad9dfeb..21a4e2f 100644
--- a/model.h
+++ b/model.h
@@ -25,8 +25,10 @@ struct mdl_vert
 {
    v3f co,
        norm;
-   v4f colour;
    v2f uv;
+   u8  colour[4];
+   u16 weights[4];
+   u8  groups[4];
 };
 
 struct mdl_submesh
@@ -52,10 +54,12 @@ struct mdl_node
    v3f s;
    
    union{ u32 submesh_start, sub_uid; };
+
    u32 
        submesh_count,
        classtype,
        offset,
+       children,
        pstr_name;
 };
 
@@ -68,7 +72,8 @@ struct mdl_header
        submesh_count, submesh_offset,
        material_count, material_offset,
        node_count, node_offset,
-       strings_offset, entdata_offset;
+       strings_offset, entdata_offset,
+       anim_count, anim_offset;
 };
 
 /* 
@@ -123,6 +128,22 @@ struct classtype_route
    v3f colour;
 };
 
+struct classtype_bone
+{
+   u32 deform;
+};
+
+struct classtype_skeleton
+{
+   u32 anim_start,
+       anim_count;
+};
+
+struct classtype_skin
+{
+   u32 skeleton;
+};
+
 #pragma pack(pop)
 
 /*
@@ -154,20 +175,35 @@ static void mesh_upload( glmesh *mesh,
    glBufferData( GL_ELEMENT_ARRAY_BUFFER, indice_count*sizeof(u32),
          indices, GL_STATIC_DRAW );
    
+   /* 0: coordinates */
    glVertexAttribPointer( 0, 3, GL_FLOAT, GL_FALSE, stride, (void*)0 );
    glEnableVertexAttribArray( 0 );
 
+   /* 1: normal */
    glVertexAttribPointer( 1, 3, GL_FLOAT, GL_FALSE, 
          stride, (void *)offsetof(mdl_vert, norm) );
    glEnableVertexAttribArray( 1 );
 
-   glVertexAttribPointer( 2, 4, GL_FLOAT, GL_FALSE, 
-         stride, (void *)offsetof(mdl_vert, colour) );
+   /* 2: uv */
+   glVertexAttribPointer( 2, 2, GL_FLOAT, GL_FALSE, 
+         stride, (void *)offsetof(mdl_vert, uv) );
    glEnableVertexAttribArray( 2 );
 
-   glVertexAttribPointer( 3, 2, GL_FLOAT, GL_FALSE, 
-         stride, (void *)offsetof(mdl_vert, uv) );
+   /* 3: colour */
+   glVertexAttribPointer( 3, 4, GL_UNSIGNED_BYTE, GL_TRUE, 
+         stride, (void *)offsetof(mdl_vert, colour) );
    glEnableVertexAttribArray( 3 );
+
+   /* 4: weights */
+   glVertexAttribPointer( 4, 4, GL_UNSIGNED_SHORT, GL_TRUE, 
+         stride, (void *)offsetof(mdl_vert, weights) );
+   glEnableVertexAttribArray( 4 );
+
+   /* 5: groups */
+   glVertexAttribIPointer( 5, 4, GL_UNSIGNED_BYTE,
+         stride, (void *)offsetof(mdl_vert, groups) );
+   glEnableVertexAttribArray( 5 );
+
    
    VG_CHECK_GL();
    mesh->indice_count = indice_count;
diff --git a/models_src/alter.mdl b/models_src/alter.mdl
new file mode 100644
index 0000000..3bd08c4
Binary files /dev/null and b/models_src/alter.mdl differ
diff --git a/models_src/ch_default.mdl b/models_src/ch_default.mdl
index f425d65..dc77e14 100644
Binary files a/models_src/ch_default.mdl and b/models_src/ch_default.mdl differ
diff --git a/models_src/ch_empty.mdl b/models_src/ch_empty.mdl
new file mode 100644
index 0000000..d7c1e56
Binary files /dev/null and b/models_src/ch_empty.mdl differ
diff --git a/models_src/ch_mike.mdl b/models_src/ch_mike.mdl
index 5fad81d..a8ccbe1 100644
Binary files a/models_src/ch_mike.mdl and b/models_src/ch_mike.mdl differ
diff --git a/models_src/ch_new.mdl b/models_src/ch_new.mdl
new file mode 100644
index 0000000..4485a4f
Binary files /dev/null and b/models_src/ch_new.mdl differ
diff --git a/models_src/ch_outlaw.mdl b/models_src/ch_outlaw.mdl
index 49a2376..53aa669 100644
Binary files a/models_src/ch_outlaw.mdl and b/models_src/ch_outlaw.mdl differ
diff --git a/models_src/epic_scene.mdl b/models_src/epic_scene.mdl
index 7b868e2..d20c9fb 100644
Binary files a/models_src/epic_scene.mdl and b/models_src/epic_scene.mdl differ
diff --git a/models_src/mp_dev.mdl b/models_src/mp_dev.mdl
index 3d5b97f..3f57971 100644
Binary files a/models_src/mp_dev.mdl and b/models_src/mp_dev.mdl differ
diff --git a/models_src/rs_cars.mdl b/models_src/rs_cars.mdl
index 3b643c1..3894c23 100644
Binary files a/models_src/rs_cars.mdl and b/models_src/rs_cars.mdl differ
diff --git a/models_src/rs_chicken.mdl b/models_src/rs_chicken.mdl
index fc0e60c..6784fb1 100644
Binary files a/models_src/rs_chicken.mdl and b/models_src/rs_chicken.mdl differ
diff --git a/models_src/rs_foliage.mdl b/models_src/rs_foliage.mdl
index b65581b..b2903d4 100644
Binary files a/models_src/rs_foliage.mdl and b/models_src/rs_foliage.mdl differ
diff --git a/models_src/rs_gate.mdl b/models_src/rs_gate.mdl
index 386dddb..939518e 100644
Binary files a/models_src/rs_gate.mdl and b/models_src/rs_gate.mdl differ
diff --git a/models_src/rs_scoretext.mdl b/models_src/rs_scoretext.mdl
index 5eef656..ecc3ecb 100644
Binary files a/models_src/rs_scoretext.mdl and b/models_src/rs_scoretext.mdl differ
diff --git a/models_src/rs_skydome.mdl b/models_src/rs_skydome.mdl
index d2a2232..a817539 100644
Binary files a/models_src/rs_skydome.mdl and b/models_src/rs_skydome.mdl differ
diff --git a/models_src/rs_vig.mdl b/models_src/rs_vig.mdl
index 1a31cd9..91f4caa 100644
Binary files a/models_src/rs_vig.mdl and b/models_src/rs_vig.mdl differ
diff --git a/network.h b/network.h
index b6cb566..998a367 100644
--- a/network.h
+++ b/network.h
@@ -329,5 +329,11 @@ static void network_end(void)
    }
 }
 
-#endif
+#else /* SR_NETWORKED */
+
+static void network_init(void){}
+static void network_update(void){}
+static void network_end(void){}
+
+#endif /* SR_NETWORKED */
 #endif /* NETWORK_H */
diff --git a/player.h b/player.h
index 1e667ca..46c7dd4 100644
--- a/player.h
+++ b/player.h
@@ -29,6 +29,7 @@ static float
 
 static int freecam = 0;
 static int walk_grid_iterations = 1;
+static float fc_speed = 10.0f;
 
 static struct gplayer
 {
@@ -100,13 +101,13 @@ static void player_mouseview(void)
       v2_sub( vg_mouse, mouse_last, delta );
       v2_copy( vg_mouse, mouse_last );
 
-      v2_muladds( view_vel, delta, 0.005f, view_vel );
+      v2_muladds( view_vel, delta, 0.001f, view_vel );
    }
    
    v2_muladds( view_vel, 
          (v2f){ vg_get_axis("h1"), vg_get_axis("v1") }, 
          0.05f, view_vel );
-   v2_muls( view_vel, 0.7f, view_vel );
+   v2_muls( view_vel, 0.93f, view_vel );
    v2_add( view_vel, player.angles, player.angles );
    player.angles[1] = vg_clampf( player.angles[1], -VG_PIf*0.5f, VG_PIf*0.5f );
 }
@@ -115,7 +116,7 @@ static void player_freecam(void)
 {
    player_mouseview();
 
-   float movespeed = 25.0f;
+   float movespeed = fc_speed;
    v3f lookdir = { 0.0f, 0.0f, -1.0f },
        sidedir = { 1.0f, 0.0f,  0.0f };
    
diff --git a/scene.h b/scene.h
index b4deaa9..8754d00 100644
--- a/scene.h
+++ b/scene.h
@@ -136,8 +136,11 @@ static void scene_add_submesh( scene *pscene, mdl_header *mdl,
 
       m4x3_mulv( transform, src->co, pvert->co );
       m3x3_mulv( normal_matrix, src->norm, pvert->norm );
-
-      v4_copy( src->colour, pvert->colour );
+      
+      pvert->colour[0] = src->colour[0];
+      pvert->colour[1] = src->colour[1];
+      pvert->colour[2] = src->colour[2];
+      pvert->colour[3] = src->colour[3];
       v2_copy( src->uv, pvert->uv );
    }
 
diff --git a/shaders/alphatest.h b/shaders/alphatest.h
index 1d16ac7..80ce028 100644
--- a/shaders/alphatest.h
+++ b/shaders/alphatest.h
@@ -11,8 +11,10 @@ static struct vg_shader _shader_alphatest = {
 .static_src = 
 "layout (location=0) in vec3 a_co;\n"
 "layout (location=1) in vec3 a_norm;\n"
-"layout (location=2) in vec4 a_colour;\n"
-"layout (location=3) in vec2 a_uv;\n"
+"layout (location=2) in vec2 a_uv;\n"
+"layout (location=3) in vec4 a_colour;\n"
+"layout (location=4) in vec4 a_weights;\n"
+"layout (location=5) in ivec4 a_groups;\n"
 "\n"
 "#line      2        0 \n"
 "\n"
diff --git a/shaders/character.h b/shaders/character.h
index 2fc85a5..8265c37 100644
--- a/shaders/character.h
+++ b/shaders/character.h
@@ -11,8 +11,10 @@ static struct vg_shader _shader_character = {
 .static_src = 
 "layout (location=0) in vec3 a_co;\n"
 "layout (location=1) in vec3 a_norm;\n"
-"layout (location=2) in vec4 a_colour;\n"
-"layout (location=3) in vec2 a_uv;\n"
+"layout (location=2) in vec2 a_uv;\n"
+"layout (location=3) in vec4 a_colour;\n"
+"layout (location=4) in vec4 a_weights;\n"
+"layout (location=5) in ivec4 a_groups;\n"
 "\n"
 "#line      2        0 \n"
 "\n"
diff --git a/shaders/gate.h b/shaders/gate.h
index 53013d0..51eb312 100644
--- a/shaders/gate.h
+++ b/shaders/gate.h
@@ -11,8 +11,10 @@ static struct vg_shader _shader_gate = {
 .static_src = 
 "layout (location=0) in vec3 a_co;\n"
 "layout (location=1) in vec3 a_norm;\n"
-"layout (location=2) in vec4 a_colour;\n"
-"layout (location=3) in vec2 a_uv;\n"
+"layout (location=2) in vec2 a_uv;\n"
+"layout (location=3) in vec4 a_colour;\n"
+"layout (location=4) in vec4 a_weights;\n"
+"layout (location=5) in ivec4 a_groups;\n"
 "\n"
 "#line      2        0 \n"
 "uniform mat4 uPv;\n"
diff --git a/shaders/gatelq.h b/shaders/gatelq.h
index 4cff927..0baf014 100644
--- a/shaders/gatelq.h
+++ b/shaders/gatelq.h
@@ -11,8 +11,10 @@ static struct vg_shader _shader_gatelq = {
 .static_src = 
 "layout (location=0) in vec3 a_co;\n"
 "layout (location=1) in vec3 a_norm;\n"
-"layout (location=2) in vec4 a_colour;\n"
-"layout (location=3) in vec2 a_uv;\n"
+"layout (location=2) in vec2 a_uv;\n"
+"layout (location=3) in vec4 a_colour;\n"
+"layout (location=4) in vec4 a_weights;\n"
+"layout (location=5) in ivec4 a_groups;\n"
 "\n"
 "#line      2        0 \n"
 "uniform mat4 uPv;\n"
diff --git a/shaders/gpos.h b/shaders/gpos.h
index 87b5843..1cb364e 100644
--- a/shaders/gpos.h
+++ b/shaders/gpos.h
@@ -11,8 +11,10 @@ static struct vg_shader _shader_gpos = {
 .static_src = 
 "layout (location=0) in vec3 a_co;\n"
 "layout (location=1) in vec3 a_norm;\n"
-"layout (location=2) in vec4 a_colour;\n"
-"layout (location=3) in vec2 a_uv;\n"
+"layout (location=2) in vec2 a_uv;\n"
+"layout (location=3) in vec4 a_colour;\n"
+"layout (location=4) in vec4 a_weights;\n"
+"layout (location=5) in ivec4 a_groups;\n"
 "\n"
 "#line      2        0 \n"
 "\n"
diff --git a/shaders/planeinf.h b/shaders/planeinf.h
index 1054aa4..a0272a8 100644
--- a/shaders/planeinf.h
+++ b/shaders/planeinf.h
@@ -11,8 +11,10 @@ static struct vg_shader _shader_planeinf = {
 .static_src = 
 "layout (location=0) in vec3 a_co;\n"
 "layout (location=1) in vec3 a_norm;\n"
-"layout (location=2) in vec4 a_colour;\n"
-"layout (location=3) in vec2 a_uv;\n"
+"layout (location=2) in vec2 a_uv;\n"
+"layout (location=3) in vec4 a_colour;\n"
+"layout (location=4) in vec4 a_weights;\n"
+"layout (location=5) in ivec4 a_groups;\n"
 "\n"
 "#line      2        0 \n"
 "\n"
diff --git a/shaders/route.h b/shaders/route.h
index cbdbeb4..2ecff91 100644
--- a/shaders/route.h
+++ b/shaders/route.h
@@ -11,8 +11,10 @@ static struct vg_shader _shader_route = {
 .static_src = 
 "layout (location=0) in vec3 a_co;\n"
 "layout (location=1) in vec3 a_norm;\n"
-"layout (location=2) in vec4 a_colour;\n"
-"layout (location=3) in vec2 a_uv;\n"
+"layout (location=2) in vec2 a_uv;\n"
+"layout (location=3) in vec4 a_colour;\n"
+"layout (location=4) in vec4 a_weights;\n"
+"layout (location=5) in ivec4 a_groups;\n"
 "\n"
 "#line      2        0 \n"
 "\n"
diff --git a/shaders/scoretext.h b/shaders/scoretext.h
index 3e499bb..a96b999 100644
--- a/shaders/scoretext.h
+++ b/shaders/scoretext.h
@@ -11,8 +11,10 @@ static struct vg_shader _shader_scoretext = {
 .static_src = 
 "layout (location=0) in vec3 a_co;\n"
 "layout (location=1) in vec3 a_norm;\n"
-"layout (location=2) in vec4 a_colour;\n"
-"layout (location=3) in vec2 a_uv;\n"
+"layout (location=2) in vec2 a_uv;\n"
+"layout (location=3) in vec4 a_colour;\n"
+"layout (location=4) in vec4 a_weights;\n"
+"layout (location=5) in ivec4 a_groups;\n"
 "\n"
 "#line      2        0 \n"
 "\n"
diff --git a/shaders/sky.h b/shaders/sky.h
index aee87f4..0abd65a 100644
--- a/shaders/sky.h
+++ b/shaders/sky.h
@@ -11,8 +11,10 @@ static struct vg_shader _shader_sky = {
 .static_src = 
 "layout (location=0) in vec3 a_co;\n"
 "layout (location=1) in vec3 a_norm;\n"
-"layout (location=2) in vec4 a_colour;\n"
-"layout (location=3) in vec2 a_uv;\n"
+"layout (location=2) in vec2 a_uv;\n"
+"layout (location=3) in vec4 a_colour;\n"
+"layout (location=4) in vec4 a_weights;\n"
+"layout (location=5) in ivec4 a_groups;\n"
 "\n"
 "#line      2        0 \n"
 "\n"
diff --git a/shaders/standard.h b/shaders/standard.h
index 83f73c1..16f36ce 100644
--- a/shaders/standard.h
+++ b/shaders/standard.h
@@ -11,8 +11,10 @@ static struct vg_shader _shader_standard = {
 .static_src = 
 "layout (location=0) in vec3 a_co;\n"
 "layout (location=1) in vec3 a_norm;\n"
-"layout (location=2) in vec4 a_colour;\n"
-"layout (location=3) in vec2 a_uv;\n"
+"layout (location=2) in vec2 a_uv;\n"
+"layout (location=3) in vec4 a_colour;\n"
+"layout (location=4) in vec4 a_weights;\n"
+"layout (location=5) in ivec4 a_groups;\n"
 "\n"
 "#line      2        0 \n"
 "\n"
diff --git a/shaders/terrain.h b/shaders/terrain.h
index 4ad91ea..0635662 100644
--- a/shaders/terrain.h
+++ b/shaders/terrain.h
@@ -11,8 +11,10 @@ static struct vg_shader _shader_terrain = {
 .static_src = 
 "layout (location=0) in vec3 a_co;\n"
 "layout (location=1) in vec3 a_norm;\n"
-"layout (location=2) in vec4 a_colour;\n"
-"layout (location=3) in vec2 a_uv;\n"
+"layout (location=2) in vec2 a_uv;\n"
+"layout (location=3) in vec4 a_colour;\n"
+"layout (location=4) in vec4 a_weights;\n"
+"layout (location=5) in ivec4 a_groups;\n"
 "\n"
 "#line      2        0 \n"
 "\n"
diff --git a/shaders/unlit.h b/shaders/unlit.h
index 25bca82..6f7466e 100644
--- a/shaders/unlit.h
+++ b/shaders/unlit.h
@@ -11,8 +11,10 @@ static struct vg_shader _shader_unlit = {
 .static_src = 
 "layout (location=0) in vec3 a_co;\n"
 "layout (location=1) in vec3 a_norm;\n"
-"layout (location=2) in vec4 a_colour;\n"
-"layout (location=3) in vec2 a_uv;\n"
+"layout (location=2) in vec2 a_uv;\n"
+"layout (location=3) in vec4 a_colour;\n"
+"layout (location=4) in vec4 a_weights;\n"
+"layout (location=5) in ivec4 a_groups;\n"
 "\n"
 "#line      2        0 \n"
 "\n"
diff --git a/shaders/vblend.h b/shaders/vblend.h
index cc05762..b8027c1 100644
--- a/shaders/vblend.h
+++ b/shaders/vblend.h
@@ -11,8 +11,10 @@ static struct vg_shader _shader_vblend = {
 .static_src = 
 "layout (location=0) in vec3 a_co;\n"
 "layout (location=1) in vec3 a_norm;\n"
-"layout (location=2) in vec4 a_colour;\n"
-"layout (location=3) in vec2 a_uv;\n"
+"layout (location=2) in vec2 a_uv;\n"
+"layout (location=3) in vec4 a_colour;\n"
+"layout (location=4) in vec4 a_weights;\n"
+"layout (location=5) in ivec4 a_groups;\n"
 "\n"
 "#line      2        0 \n"
 "\n"
diff --git a/shaders/vertex_standard.glsl b/shaders/vertex_standard.glsl
index 0b46d33..a780cf7 100644
--- a/shaders/vertex_standard.glsl
+++ b/shaders/vertex_standard.glsl
@@ -1,4 +1,6 @@
 layout (location=0) in vec3 a_co;
 layout (location=1) in vec3 a_norm;
-layout (location=2) in vec4 a_colour;
-layout (location=3) in vec2 a_uv;
+layout (location=2) in vec2 a_uv;
+layout (location=3) in vec4 a_colour;
+layout (location=4) in vec4 a_weights;
+layout (location=5) in ivec4 a_groups;
diff --git a/shaders/water.h b/shaders/water.h
index 13a718f..0171a52 100644
--- a/shaders/water.h
+++ b/shaders/water.h
@@ -11,8 +11,10 @@ static struct vg_shader _shader_water = {
 .static_src = 
 "layout (location=0) in vec3 a_co;\n"
 "layout (location=1) in vec3 a_norm;\n"
-"layout (location=2) in vec4 a_colour;\n"
-"layout (location=3) in vec2 a_uv;\n"
+"layout (location=2) in vec2 a_uv;\n"
+"layout (location=3) in vec4 a_colour;\n"
+"layout (location=4) in vec4 a_weights;\n"
+"layout (location=5) in ivec4 a_groups;\n"
 "\n"
 "#line      2        0 \n"
 "\n"
diff --git a/textures_src/graffitibox.png b/textures_src/graffitibox.png
new file mode 100644
index 0000000..29d2d9f
Binary files /dev/null and b/textures_src/graffitibox.png differ
diff --git a/world.h b/world.h
index c6d0714..3c20e81 100644
--- a/world.h
+++ b/world.h
@@ -62,8 +62,10 @@ static struct gworld
    scene geo, foliage;
    rigidbody rb_geo;
 
+   /* TODO Maybe make this less hardcoded */
    mdl_submesh sm_geo_std_oob, sm_geo_std, sm_geo_vb,
-               sm_foliage_main, sm_foliage_alphatest;
+               sm_foliage_main, sm_foliage_alphatest,
+               sm_graffiti;
 
    glmesh skybox, skydome;
    mdl_submesh dome_upper, dome_lower;
@@ -99,6 +101,9 @@ vg_tex2d tex_terrain_noise = { .path = "textures/garbage.qoi",
 vg_tex2d tex_alphatest = { .path = "textures/alphatest.qoi",
                                  .flags = VG_TEXTURE_NEAREST };
 
+vg_tex2d tex_graffiti = { .path = "textures/graffitibox.qoi",
+                                 .flags = VG_TEXTURE_NEAREST };
+
 static void ray_world_get_tri( ray_hit *hit, v3f tri[3] )
 {
    for( int i=0; i<3; i++ )
@@ -349,7 +354,8 @@ static void world_load(void)
    u32 mat_surf = 0,
        mat_surf_oob = 0,
        mat_vertex_blend = 0,
-       mat_alphatest = 0;
+       mat_alphatest = 0,
+       mat_graffiti = 0;
 
    for( int i=1; i<mworld->material_count; i++ )
    {
@@ -364,6 +370,8 @@ static void world_load(void)
          mat_vertex_blend = i;
       else if( !strcmp( "alphatest", mat_name ))
          mat_alphatest = i;
+      else if( !strcmp( "graffitibox", mat_name ))
+         mat_graffiti = i;
    }
 
    m4x3f midentity;
@@ -398,6 +406,9 @@ static void world_load(void)
    add_all_if_material( midentity, &world.foliage, mworld, mat_alphatest );
    scene_copy_slice( &world.foliage, &world.sm_foliage_alphatest );
 
+   add_all_if_material( midentity, &world.foliage, mworld, mat_graffiti );
+   scene_copy_slice( &world.foliage, &world.sm_graffiti );
+
    scene_upload( &world.foliage );
    world_routes_loadfrom( mworld );
 
@@ -485,7 +496,8 @@ static void world_init(void)
 {
    vg_tex2d_init( (vg_tex2d *[]){ &tex_terrain_colours, 
                                   &tex_terrain_noise,
-                                  &tex_alphatest }, 3 );
+                                  &tex_alphatest,
+                                  &tex_graffiti }, 4 );
 
    mdl_header *mcars = mdl_load( "models/rs_cars.mdl" );
    mdl_unpack_glmesh( mcars, &world.cars );
@@ -593,6 +605,10 @@ static void render_world_alphatest( m4x4f projection, v3f camera )
    glDisable(GL_CULL_FACE);
    scene_bind( &world.foliage );
    mdl_draw_submesh( &world.sm_foliage_alphatest );
+
+   vg_tex2d_bind( &tex_graffiti, 1 );
+   mdl_draw_submesh( &world.sm_graffiti );
+
    glEnable(GL_CULL_FACE);
 }
 
@@ -679,15 +695,22 @@ static void render_sky(m4x3f camera)
 
 static void render_world_gates( m4x4f projection, m4x3f camera )
 {
-   int count = 0;
+   float closest = INFINITY;
+   int   id = 0;
+
    for( int i=0; i<world.routes.gate_count; i++ )
    {
       struct route_gate *rg = &world.routes.gates[i];
-      count += render_gate( &rg->gate, camera );
+      float dist = v3_dist2( rg->gate.co[0], camera[3] );
 
-      if( count == 2 )
-         return;
+      if( dist < closest )
+      {
+         closest = dist;
+         id = i;
+      }
    }
+
+   render_gate( &world.routes.gates[id].gate, camera );
 }
 
 static void render_world( m4x4f projection, m4x3f camera )
diff --git a/world_routes.h b/world_routes.h
index 5ebcbcc..f899694 100644
--- a/world_routes.h
+++ b/world_routes.h
@@ -875,8 +875,6 @@ static void world_routes_gen_meshes(void)
                v3_muladds( hb.pos, up, 0.06f, vb.co );
                v3_copy( up, va.norm );
                v3_copy( up, vb.norm );
-               v3_zero( va.colour );
-               v3_zero( vb.colour );
                v2_zero( va.uv );
                v2_zero( vb.uv );