X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=blender_export.py;h=e9b7a1e46d8d7c9ceb6b4cdb70e22baaf6ca178e;hb=e311bbe2fa903a7e2a922f202f389b799193195d;hp=8b0bd104b88aef9a9ab0a9b747423b6a0810181d;hpb=dd7d6eb0702cd9a0c97ab6da9ec577af0b797b88;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/blender_export.py b/blender_export.py index 8b0bd10..e9b7a1e 100644 --- a/blender_export.py +++ b/blender_export.py @@ -41,13 +41,15 @@ sr_entity_list = [ ('ent_challenge', 'Challenge', '', 19 ), ('ent_relay', 'Relay', '', 20 ), ('ent_miniworld', 'Mini World', '', 22 ), - ('ent_prop', 'Prop', '', 23 ) + ('ent_prop', 'Prop', '', 23 ), + ('ent_list', 'Entity List', '', 24 ), + ('ent_region', 'Region', '', 25 ) ] MDL_VERSION_NR = 104 SR_TRIGGERABLE = [ 'ent_audio', 'ent_ccmd', 'ent_gate', 'ent_challenge', \ 'ent_relay', 'ent_skateshop', 'ent_objective', 'ent_route',\ - 'ent_miniworld' ] + 'ent_miniworld', 'ent_region' ] def get_entity_enum_id( alias ): #{ @@ -273,6 +275,10 @@ class ent_route(Structure): sr_functions = { 0: 'view' } #} +class ent_list(Structure):#{ + _fields_ = [("start",c_uint16),("count",c_uint16)] +#} + class ent_water(Structure): #{ _fields_ = [("transform",mdl_transform), @@ -478,7 +484,8 @@ class ent_worldinfo(Structure): ("pstr_author",c_uint32), # unused ("pstr_desc",c_uint32), # unused ("timezone",c_float), - ("pstr_skybox",c_uint32)] + ("pstr_skybox",c_uint32), + ("flags",c_uint32)] #} class ent_ccmd(Structure): @@ -516,6 +523,15 @@ class ent_challenge(Structure):#{ 1: 'view/reset' } #} +class ent_region(Structure):#{ + _fields_ = [("transform",mdl_transform), + ("submesh_start",c_uint32), ("submesh_count",c_uint32), + ("pstr_title",c_uint32), + ("flags",c_uint32), + ("zone_volume",c_uint32)] + sr_functions = { 0: 'enter', 1: 'leave' } +#} + class ent_relay(Structure):#{ _fields_ = [("targets",(c_uint32*2)*4), ("targets_events",c_uint32*4)] @@ -532,6 +548,8 @@ class ent_cubemap(Structure):#{ ("placeholder",c_uint32*2)] #} +print( sizeof(ent_cubemap) ) + class ent_miniworld(Structure):#{ _fields_ = [("transform",mdl_transform), ("pstr_world",c_uint32), @@ -545,7 +563,8 @@ class ent_prop(Structure):#{ _fields_ = [("transform",mdl_transform), ("submesh_start",c_uint32), ("submesh_count",c_uint32), - ("flags",c_uint32)] + ("flags",c_uint32), + ("pstr_alias",c_uint32)] #} def obj_ent_type( obj ): @@ -853,6 +872,7 @@ def sr_compile_material( mat ):#{ if mat.SR_data.shader == 'standard': m.shader = 0 if mat.SR_data.shader == 'standard_cutout': m.shader = 1 + if mat.SR_data.shader == 'foliage': m.shader = 10 if mat.SR_data.shader == 'terrain_blend':#{ m.shader = 2 @@ -912,7 +932,8 @@ def sr_compile_material( mat ):#{ #} if mat.SR_data.shader in ['standard', 'standard_cutout', 'terrain_blend', \ - 'vertex_blend', 'fxglow', 'cubemap' ]: #{ + 'vertex_blend', 'fxglow', 'cubemap', \ + 'foliage' ]: #{ if 'tex_diffuse' in inf: m.tex_diffuse = sr_compile_texture(inf['tex_diffuse']) #} @@ -1690,6 +1711,7 @@ def sr_compile( collection ): if ent_type == 'ent_font_variant': continue if ent_type == 'ent_menuitem': continue if ent_type == 'ent_objective': continue + if ent_type == 'ent_region': continue #TODO: This is messy. if ent_type == 'ent_gate':#{ @@ -1698,7 +1720,7 @@ def sr_compile( collection ): #} #-------------------------- - print( F'[SR] {i: 3}/{mesh_count} {obj.name:<40}', end='\r' ) + print( F'[SR] {i: 3}/{mesh_count} {obj.name:<40}' ) sr_compile_mesh( obj ) #} #} @@ -1918,7 +1940,17 @@ def sr_compile( collection ): worldinfo.pstr_name = sr_compile_string( obj_data.name ) worldinfo.pstr_author = sr_compile_string( obj_data.author ) worldinfo.pstr_desc = sr_compile_string( obj_data.desc ) - worldinfo.timezone = obj_data.timezone + + flags = 0x00 + + if obj_data.fix_time:#{ + worldinfo.timezone = obj_data.fixed_time + flags |= 0x1 + #} + else: + worldinfo.timezone = obj_data.timezone + + worldinfo.flags = flags worldinfo.pstr_skybox = sr_compile_string( obj_data.skybox ) sr_ent_push( worldinfo ) #} @@ -1960,6 +1992,16 @@ def sr_compile( collection ): challenge.status = 0 sr_ent_push( challenge ) #} + elif ent_type == 'ent_region':#{ + region = ent_region() + obj_data = obj.SR_data.ent_region[0] + compile_obj_transform( obj, region.transform ) + region.submesh_start, region.submesh_count, _ = \ + sr_compile_mesh_internal( obj ) + region.pstr_title = sr_compile_string( obj_data.title ) + region.zone_volume = sr_entity_id( obj_data.zone_volume ) + sr_ent_push( region ) + #} elif ent_type == 'ent_relay':#{ relay = ent_relay() obj_data = obj.SR_data.ent_relay[0] @@ -1995,10 +2037,12 @@ def sr_compile( collection ): #} elif ent_type == 'ent_prop':#{ prop = ent_prop() + obj_data = obj.SR_data.ent_prop[0] compile_obj_transform( obj, prop.transform ) prop.submesh_start, prop.submesh_count, _ = \ sr_compile_mesh_internal( obj ) - prop.flags = 0 + prop.flags = obj_data.flags + prop.pstr_alias = sr_compile_string( obj_data.alias ) sr_ent_push( prop ) #} #} @@ -2986,6 +3030,66 @@ class SR_OBJECT_ENT_ROUTE(bpy.types.PropertyGroup): #} #} + +class SR_OT_ENT_LIST_NEW_ITEM(bpy.types.Operator):#{ + bl_idname = "skaterift.ent_list_new_entry" + bl_label = "Add entity" + + def execute(self, context):#{ + return internal_listadd_execute(self,context,'ent_list','entities') + #} +#} + +class SR_OT_ENT_LIST_DEL_ITEM(bpy.types.Operator):#{ + bl_idname = "skaterift.ent_list_del_entry" + bl_label = "Remove entity" + + @classmethod + def poll(cls, context):#{ + active_object = context.active_object + if obj_ent_type(active_object) == 'ent_list':#{ + return active_object.SR_data.ent_list[0].entities + #} + else: return False + #} + + def execute(self, context):#{ + return internal_listdel_execute(self,context,'ent_list','entities') + #} +#} + +class SR_OBJECT_ENT_LIST_ENTRY(bpy.types.PropertyGroup): +#{ + target: bpy.props.PointerProperty( \ + type=bpy.types.Object, name='target' ) +#} + +class SR_UL_ENT_LIST(bpy.types.UIList):#{ + bl_idname = 'SR_UL_ENT_LIST' + + def draw_item(_,context,layout,data,item,icon,active_data,active_propname):#{ + layout.prop( item, 'target', text='', emboss=False ) + #} +#} + +class SR_OBJECT_ENT_LIST(bpy.types.PropertyGroup):#{ + entities: bpy.props.CollectionProperty(type=SR_OBJECT_ENT_LIST_ENTRY) + entities_index: bpy.props.IntProperty() + + @staticmethod + def sr_inspector( layout, data ):#{ + layout.label( text='Entities' ) + layout.template_list('SR_UL_ENT_LIST', 'Entities', \ + data[0], 'entities', data[0], \ + 'entities_index', rows=5) + + row = layout.row() + row.operator( 'skaterift.ent_list_new_entry', text='Add' ) + row.operator( 'skaterift.ent_list_del_entry', text='Remove' ) + #} +#} + + class SR_OBJECT_ENT_VOLUME(bpy.types.PropertyGroup):#{ subtype: bpy.props.EnumProperty( name="Subtype", @@ -3116,6 +3220,7 @@ class SR_OBJECT_ENT_AUDIO(bpy.types.PropertyGroup): class SR_OBJECT_ENT_MARKER(bpy.types.PropertyGroup): #{ alias: bpy.props.StringProperty() + flags: bpy.props.IntProperty() #} class SR_OBJECT_ENT_GLYPH(bpy.types.PropertyGroup): @@ -3323,8 +3428,24 @@ class SR_OBJECT_ENT_WORLD_INFO(bpy.types.PropertyGroup): name: bpy.props.StringProperty(name="Name") desc: bpy.props.StringProperty(name="Description") author: bpy.props.StringProperty(name="Author") - timezone: bpy.props.FloatProperty(name="Timezone(hrs) (UTC0 +hrs)") skybox: bpy.props.StringProperty(name="Skybox") + + fix_time: bpy.props.BoolProperty(name="Fix Time") + timezone: bpy.props.FloatProperty(name="Timezone(hrs) (UTC0 +hrs)") + fixed_time: bpy.props.FloatProperty(name="Fixed Time (0-1)") + + @staticmethod + def sr_inspector( layout, data ):#{ + layout.prop( data[0], 'name' ) + layout.prop( data[0], 'desc' ) + layout.prop( data[0], 'author' ) + + layout.prop( data[0], 'fix_time' ) + if data[0].fix_time: + layout.prop( data[0], 'fixed_time' ) + else: + layout.prop( data[0], 'timezone' ) + #} #} class SR_OBJECT_ENT_CCMD(bpy.types.PropertyGroup): @@ -3400,6 +3521,13 @@ class SR_OBJECT_ENT_CHALLENGE(bpy.types.PropertyGroup):#{ #} #} +class SR_OBJECT_ENT_REGION(bpy.types.PropertyGroup):#{ + title: bpy.props.StringProperty( name="Title" ) + zone_volume: bpy.props.PointerProperty( + type=bpy.types.Object, name="Zone Volume", \ + poll=lambda self,obj: sr_filter_ent_type(obj,['ent_volume'])) +#} + class SR_OBJECT_ENT_RELAY(bpy.types.PropertyGroup):#{ target0: bpy.props.PointerProperty( \ type=bpy.types.Object, name="Target 0", \ @@ -3436,6 +3564,7 @@ class SR_OBJECT_PROPERTIES(bpy.types.PropertyGroup): ent_volume: bpy.props.CollectionProperty(type=SR_OBJECT_ENT_VOLUME) ent_audio: bpy.props.CollectionProperty(type=SR_OBJECT_ENT_AUDIO) ent_marker: bpy.props.CollectionProperty(type=SR_OBJECT_ENT_MARKER) + ent_prop: bpy.props.CollectionProperty(type=SR_OBJECT_ENT_MARKER) ent_glyph: bpy.props.CollectionProperty(type=SR_OBJECT_ENT_GLYPH) ent_font: bpy.props.CollectionProperty(type=SR_OBJECT_ENT_FONT) ent_traffic: bpy.props.CollectionProperty(type=SR_OBJECT_ENT_TRAFFIC) @@ -3447,8 +3576,10 @@ class SR_OBJECT_PROPERTIES(bpy.types.PropertyGroup): ent_ccmd: bpy.props.CollectionProperty(type=SR_OBJECT_ENT_CCMD) ent_objective: bpy.props.CollectionProperty(type=SR_OBJECT_ENT_OBJECTIVE) ent_challenge: bpy.props.CollectionProperty(type=SR_OBJECT_ENT_CHALLENGE) + ent_region: bpy.props.CollectionProperty(type=SR_OBJECT_ENT_REGION) ent_relay: bpy.props.CollectionProperty(type=SR_OBJECT_ENT_RELAY) ent_miniworld: bpy.props.CollectionProperty(type=SR_OBJECT_ENT_MINIWORLD) + ent_list: bpy.props.CollectionProperty(type=SR_OBJECT_ENT_LIST) ent_type: bpy.props.EnumProperty( name="Type", @@ -3526,7 +3657,8 @@ class SR_MATERIAL_PROPERTIES(bpy.types.PropertyGroup): ('boundary','Boundary',''), ('fxglow','FX Glow',''), ('cubemap','Cubemap',''), - ('walking','Walking','') + ('walking','Walking',''), + ('foliage','Foliage','') ]) surface_prop: bpy.props.EnumProperty( @@ -4683,7 +4815,10 @@ classes = [ SR_INTERFACE, SR_MATERIAL_PANEL,\ SR_OBJECT_ENT_WORKSHOP_PREVIEW,SR_OBJECT_ENT_MENU_ITEM,\ SR_OBJECT_ENT_WORLD_INFO,SR_OBJECT_ENT_CCMD,\ SR_OBJECT_ENT_OBJECTIVE,SR_OBJECT_ENT_CHALLENGE,\ + SR_OBJECT_ENT_REGION,\ SR_OBJECT_ENT_RELAY,SR_OBJECT_ENT_MINIWORLD,\ + SR_OBJECT_ENT_LIST_ENTRY, SR_UL_ENT_LIST, SR_OBJECT_ENT_LIST, \ + SR_OT_ENT_LIST_NEW_ITEM, SR_OT_ENT_LIST_DEL_ITEM,\ \ SR_OBJECT_PROPERTIES, SR_LIGHT_PROPERTIES, SR_BONE_PROPERTIES, SR_MESH_PROPERTIES, SR_MATERIAL_PROPERTIES \