basic replayable replays

[carveJwlIkooP6JGAAIwe30JlM.git] / blender_export.py

diff --git a/blender_export.py b/blender_export.py
index 8c1eaace97da36bdd8f3831d403f8521a9c86e8c..2b059d9730b125ccba52973a9c1cb8145ce80bec 100644 (file)
--- a/blender_export.py
+++ b/blender_export.py
@@ -35,6 +35,7 @@ sr_entity_list = [
    ('ent_swspreview', 'Workshop Preview', '', 14 ),
    ('ent_menuitem',     'Menu Item',      '', 15 ),
    ('ent_worldinfo',    'World Info',     '', 16 ),
+   ('ent_ccmd',         'CCmd',           '', 17 )
 ]
 
 def get_entity_enum_id( alias ):
@@ -439,6 +440,11 @@ class ent_worldinfo(Structure):
                ("timezone",c_float)]
 #}
 
+class ent_ccmd(Structure):
+#{
+   _fields_ = [("pstr_command",c_uint32)]
+#}
+
 def obj_ent_type( obj ):
 #{
    if obj.type == 'ARMATURE': return 'mdl_armature'
@@ -754,14 +760,18 @@ def sr_compile_material( mat ):
    if mat.SR_data.shader == 'boundary':#{
       m.shader = 6
    #}
+
+   if mat.SR_data.shader == 'fxglow':#{
+      m.shader = 7
+   #}
    
    inf = material_info( mat )
 
    if mat.SR_data.shader == 'standard' or \
       mat.SR_data.shader == 'standard_cutout' or \
       mat.SR_data.shader == 'terrain_blend' or \
-      mat.SR_data.shader == 'vertex_blend':
-   #{
+      mat.SR_data.shader == 'vertex_blend' or \
+      mat.SR_data.shader == 'fxglow': #{
       if 'tex_diffuse' in inf: 
          m.tex_diffuse = sr_compile_texture(inf['tex_diffuse'])
    #}
@@ -1727,6 +1737,12 @@ def sr_compile( collection ):
             worldinfo.timezone = obj_data.timezone
             sr_ent_push( worldinfo )
          #}
+         elif ent_type == 'ent_ccmd':#{
+            ccmd = ent_ccmd()
+            obj_data = obj.SR_data.ent_ccmd[0]
+            ccmd.pstr_command = sr_compile_string( obj_data.command )
+            sr_ent_push( ccmd )
+         #}
       #}
    #}
 
@@ -1922,6 +1938,7 @@ def sr_compile( collection ):
    path = F"{folder}{collection.name}.mdl"
    print( path )
 
+   os.makedirs(os.path.dirname(path),exist_ok=True)
    fp = open( path, "wb" )
    header = mdl_header()
    header.version = 101
@@ -2676,7 +2693,7 @@ class SR_OBJECT_ENT_VOLUME(bpy.types.PropertyGroup):
    target: bpy.props.PointerProperty( \
            type=bpy.types.Object, name="Target", \
            poll=lambda self,obj: sr_filter_ent_type(obj,\
-                                    ['ent_audio','ent_skateshop']))
+                                    ['ent_audio','ent_skateshop','ent_ccmd']))
 
    @staticmethod
    def sr_inspector( layout, data ):
@@ -2747,16 +2764,15 @@ class SR_OBJECT_ENT_AUDIO(bpy.types.PropertyGroup):
       box.prop( data[0], 'flag_loop' )
       box.prop( data[0], 'flag_auto' )
 
+      layout.prop( data[0], 'probability_curve' )
+
       split = layout.split(factor=0.7)
       c = split.column()
       c.label( text='Filepath' )
       c = split.column()
-      c.label( text='Chance (0.1s)' )
-
-      layout.prop( data[0], 'probability_curve' )
-
+      c.label( text='Chance' )
       layout.template_list('SR_UL_AUDIO_LIST', 'Files', \
-                            data[0], 'files', data[0], 'file_index', rows=5)
+                            data[0], 'files', data[0], 'files_index', rows=5)
 
       row = layout.row()
       row.operator( 'skaterift.al_new_entry', text='Add' )
@@ -2961,6 +2977,11 @@ class SR_OBJECT_ENT_WORLD_INFO(bpy.types.PropertyGroup):
    timezone: bpy.props.FloatProperty(name="Timezone(hrs) (UTC0 +hrs)")
 #}
 
+class SR_OBJECT_ENT_CCMD(bpy.types.PropertyGroup):
+#{
+   command: bpy.props.StringProperty(name="Command Line")
+#}
+
 class SR_OBJECT_PROPERTIES(bpy.types.PropertyGroup):
 #{
    ent_gate: bpy.props.CollectionProperty(type=SR_OBJECT_ENT_GATE)
@@ -2977,6 +2998,7 @@ class SR_OBJECT_PROPERTIES(bpy.types.PropertyGroup):
          bpy.props.CollectionProperty(type=SR_OBJECT_ENT_WORKSHOP_PREVIEW)
    ent_menuitem: bpy.props.CollectionProperty(type=SR_OBJECT_ENT_MENU_ITEM)
    ent_worldinfo: bpy.props.CollectionProperty(type=SR_OBJECT_ENT_WORLD_INFO)
+   ent_ccmd: bpy.props.CollectionProperty(type=SR_OBJECT_ENT_CCMD)
 
    ent_type: bpy.props.EnumProperty(
       name="Type",
@@ -3051,7 +3073,8 @@ class SR_MATERIAL_PROPERTIES(bpy.types.PropertyGroup):
       ('vertex_blend', "vertex_blend", ''),
       ('water',"water",''),
       ('invisible','Invisible',''),
-      ('boundary','Boundary','')
+      ('boundary','Boundary',''),
+      ('fxglow','FX Glow',''),
       ])
 
    surface_prop: bpy.props.EnumProperty(
@@ -3385,7 +3408,8 @@ def cv_draw_lines():
          cv_view_shader, 'LINES', \
          { "pos":cv_view_verts, "color":cv_view_colours })
 
-   lines.draw( cv_view_shader )
+   if bpy.context.scene.SR_data.gizmos:
+      lines.draw( cv_view_shader )
 
    cv_view_verts = []
    cv_view_colours = []
@@ -3462,8 +3486,8 @@ def draw_cone_twist( center, vx, vy, va ):
       p0 = center + (axis + vx*c0 + vy*s0).normalized() * size
       p1 = center + (axis + vx*c1 + vy*s1).normalized() * size
 
-      col0 = ( abs(c0), abs(s0), 0.0, 1.0 )
-      col1 = ( abs(c1), abs(s1), 0.0, 1.0 )
+      col0 = ( abs(c0), abs(s0), 0.0 )
+      col1 = ( abs(c1), abs(s1), 0.0 )
 
       cv_view_verts += [center, p0, p0, p1]
       cv_view_colours += [ (0,0,0), col0, col0, col1 ]
@@ -4096,7 +4120,7 @@ classes = [ SR_INTERFACE, SR_MATERIAL_PANEL,\
             SR_UL_FONT_VARIANT_LIST,SR_UL_FONT_GLYPH_LIST,\
             SR_OBJECT_ENT_FONT,SR_OBJECT_ENT_TRAFFIC,SR_OBJECT_ENT_SKATESHOP,\
             SR_OBJECT_ENT_WORKSHOP_PREVIEW,SR_OBJECT_ENT_MENU_ITEM,\
-            SR_OBJECT_ENT_WORLD_INFO,\
+            SR_OBJECT_ENT_WORLD_INFO,SR_OBJECT_ENT_CCMD,\
             \
             SR_OBJECT_PROPERTIES, SR_LIGHT_PROPERTIES, SR_BONE_PROPERTIES, 
             SR_MESH_PROPERTIES, SR_MATERIAL_PROPERTIES \