X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;ds=sidebyside;f=blender_export.py;h=820c49ac05e6f721af4ca38ab7f02e200bb5e616;hb=7eba38b8178c82040618a518634d8ff4813e2ff2;hp=ae8b641b3db7963004c5f706cc425e1dd1b0ac08;hpb=a1b878e2cdbf145b59d611b5060d3c1a1a80d017;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/blender_export.py b/blender_export.py
index ae8b641..820c49a 100644
--- a/blender_export.py
+++ b/blender_export.py
@@ -450,7 +450,11 @@ class ent_challenge(Structure):#{
    _fields_ = [("transform",mdl_transform),
                ("submesh_start",c_uint32), ("submesh_count",c_uint32),
                ("id_next",c_uint32),
-               ("filter",c_uint32)]
+               ("filter",c_uint32),
+               ("time_limit",c_float)]
+
+   sr_functions = { 0: 'trigger',
+                    1: 'start_challenge' }
 #}
 
 def obj_ent_type( obj ):
@@ -476,6 +480,31 @@ def sr_filter_ent_type( obj, ent_types ):
    return False
 #}
 
+def v4_dot( a, b ):#{
+   return a[0]*b[0] + a[1]*b[1] + a[2]*b[2] + a[3]*b[3]
+#}
+
+def q_identity( q ):#{
+   q[0] = 0.0
+   q[1] = 0.0
+   q[2] = 0.0
+   q[3] = 1.0
+#}
+
+def q_normalize( q ):#{
+   l2 = v4_dot(q,q)
+   if( l2 < 0.00001 ):#{
+      q_identity( q )
+   #}
+   else:#{
+      s = 1.0/math.sqrt(l2)
+      q[0] *= s
+      q[1] *= s
+      q[2] *= s
+      q[3] *= s
+   #}
+#}
+
 def compile_obj_transform( obj, transform ):
 #{
    co = obj.matrix_world @ Vector((0,0,0))
@@ -483,6 +512,7 @@ def compile_obj_transform( obj, transform ):
    # This was changed from matrix_local on 09.05.23
    q = obj.matrix_world.to_quaternion() 
    s = obj.scale
+   q_normalize( q )
    
    # Setup transform
    #
@@ -1397,6 +1427,7 @@ def sr_compile_armature( obj ):
                      lc_m = smtx.inverted() @ lc_m
                   #}
                   rq = lc_m.to_quaternion()
+                  q_normalize( rq )
 
                   kf = mdl_transform()
                   kf.co[0] =  loc[0]
@@ -1696,6 +1727,7 @@ def sr_compile( collection ):
 
             if obj_data.target:#{
                volume.target = sr_entity_id( obj_data.target )
+               volume._anon.trigger.event = obj_data.event
             #}
 
             sr_ent_push(volume)
@@ -1757,6 +1789,8 @@ def sr_compile( collection ):
             challenge = ent_challenge()
             obj_data = obj.SR_data.ent_challenge[0]
             challenge.id_next = sr_entity_id( obj_data.proxima )
+            challenge.filter = 0
+            challenge.time_limit = obj_data.time_limit
 
             compile_obj_transform( obj, challenge.transform )
             challenge.submesh_start, challenge.submesh_count, _ = \
@@ -2703,8 +2737,7 @@ class SR_OBJECT_ENT_ROUTE(bpy.types.PropertyGroup):
    #}
 #}
 
-class SR_OBJECT_ENT_VOLUME(bpy.types.PropertyGroup):
-#{
+class SR_OBJECT_ENT_VOLUME(bpy.types.PropertyGroup):#{
    subtype: bpy.props.EnumProperty(
       name="Subtype",
       items=[('0','Trigger',''),
@@ -2714,14 +2747,33 @@ 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_ccmd']))
+                                    ['ent_audio','ent_skateshop','ent_ccmd',\
+                                     'ent_challenge']))
+
+   event: bpy.props.IntProperty( name="Event/Method" )
 
    @staticmethod
-   def sr_inspector( layout, data ):
-   #{
-      data = data[0]
-      layout.prop( data, 'subtype' )
-      layout.prop( data, 'target' )
+   def sr_inspector( layout, data ):#{
+      layout.prop( data[0], 'subtype' )
+      layout.prop( data[0], 'target' )
+
+      row = layout.row()
+      row.prop( data[0], 'event' )
+
+      if data[0].target:#{
+         tipo = data[0].target.SR_data.ent_type
+         cls = globals()[ tipo ]
+
+         table = getattr( cls, 'sr_functions', None )
+         if table:#{
+            if data[0].event in table:#{
+               row.label( text=table[data[0].event] )
+            #}
+            else:#{
+               row.label( text="undefined function" )
+            #}
+         #}
+      #}
    #}
 #}
 
@@ -3011,6 +3063,8 @@ class SR_OBJECT_ENT_CHALLENGE(bpy.types.PropertyGroup):#{
            type=bpy.types.Object, name="Target", \
            poll=lambda self,obj: sr_filter_ent_type(obj,\
                                     ['ent_audio','ent_ccmd']))
+   event: bpy.props.IntProperty( name="Event/Method" )
+   time_limit: bpy.props.FloatProperty( name="Time Limit", default=1.0 )
 #}
 
 class SR_OBJECT_PROPERTIES(bpy.types.PropertyGroup):
@@ -3676,14 +3730,14 @@ def cv_ent_volume( obj ):
       cv_draw_ucube( obj.matrix_world, (0,1,0) )
 
       if data.target:#{
-         cv_draw_line( obj.location, data.target.location, (0,1,0) )
+         cv_draw_arrow( obj.location, data.target.location, (0,1,0) )
       #}
    #}
    elif data.subtype == '1':#{
       cv_draw_ucube( obj.matrix_world, (1,1,0) )
 
       if data.target:#{
-         cv_draw_line( obj.location, data.target.location, (1,1,0) )
+         cv_draw_arrow( obj.location, data.target.location, (1,1,0) )
       #}
    #}
 #}
@@ -3962,6 +4016,12 @@ def cv_draw():
          elif ent_type == 'ent_volume':#{
             cv_ent_volume( obj )
          #}
+         elif ent_type == 'ent_challenge':#{
+            data = obj.SR_data.ent_challenge[0]
+            if data.proxima:#{
+               cv_draw_arrow( obj.location, data.proxima.location, (0,0.2,1.0) )
+            #}
+         #}
          elif ent_type == 'ent_audio':#{
             if obj.SR_data.ent_audio[0].flag_3d:
                cv_draw_sphere( obj.location, obj.scale[0], (1,1,0) )