Update to CMake, tweaks & dds
[convexer.git] / __init__.py
index 14f23e5c581b58a65a0648da0912faf57a22105e..7ba2584dbb5c0482840656d7441536f9f2b90ffb 100644 (file)
@@ -255,14 +255,20 @@ class cxr_tri_mesh(Structure):
                ("indices_count",c_int32),
                ("vertex_count",c_int32)]
 
+class cxr_visgroup(Structure):
+   _fields_ = [("name",c_char_p)]
+
 class cxr_vmf_context(Structure):
    _fields_ = [("mapversion",c_int32),
                ("skyname",c_char_p),
                ("detailvbsp",c_char_p),
                ("detailmaterial",c_char_p),
+               ("visgroups",POINTER(cxr_visgroup)),
+               ("visgroup_count",c_int32),
                ("scale",c_double),
                ("offset",c_double *3),
                ("lightmap_scale",c_int32),
+               ("visgroupid",c_int32),
                ("brush_count",c_int32),
                ("entity_count",c_int32),
                ("face_count",c_int32)]
@@ -556,6 +562,16 @@ def cxr_baseclass(classes, other):
       base.update(x.copy())
    return base
 
+def ent_soundscape(context):
+   obj = context['object']
+   kvs = cxr_baseclass([ent_origin],\
+   {
+      "radius": obj.scale.x * bpy.context.scene.cxr_data.scale_factor,
+      "soundscape": {"type":"string","default":""}
+   })
+
+   return kvs
+
 # EEVEE Light component converter -> Source 1
 #
 def ent_lights(context):
@@ -598,7 +614,7 @@ def ent_lights(context):
    elif obj.data.type == 'POINT':
       kvs['_light'] = [ int(x) for x in light_base]
       kvs['_quadratic_attn'] = 1.0
-      kvs['_linear_attn'] = 0.0
+      kvs['_linear_attn'] = 1.0
    
    elif obj.data.type == 'SUN':
       light_base[3] *= 300.0 * 5
@@ -624,6 +640,7 @@ def ent_prop(context):
 
       kvs['origin'] = [pos[1],-pos[0],pos[2]]
       kvs['angles'] = [0,180,0]
+      kvs['uniformscale'] = 1.0
    else:
       kvs = cxr_baseclass([ent_origin],{})
       target = context['object'].instance_collection
@@ -636,10 +653,15 @@ def ent_prop(context):
       angle[2] = euler[0]
       
       kvs['angles'] = angle
+      kvs['uniformscale'] = obj.scale[0]
+   
+   if target.cxr_data.shadow_caster:
+      kvs['enablelightbounce'] = 1
+      kvs['disableshadows'] = 0
+   else:
+      kvs['enablelightbounce'] = 0
+      kvs['disableshadows'] = 1
 
-
-   kvs['enablelightbounce'] = 1
-   kvs['disableshadows'] = 0
    kvs['fademindist'] = -1
    kvs['fadescale'] = 1
    kvs['model'] = F"{asset_path('models',target)}.mdl".lower()
@@ -647,7 +669,6 @@ def ent_prop(context):
    kvs['rendercolor'] = [255, 255, 255]
    kvs['skin'] = 0
    kvs['solid'] = 6
-   kvs['uniformscale'] = 1.0
 
    return kvs
 
@@ -710,7 +731,7 @@ def asset_uid(asset):
    name = ""
 
    if v == 0:
-      name = "A"
+      name = "a"
    else:
       dig = []
       
@@ -1031,6 +1052,12 @@ def cxr_export_vmf(sceneinfo, output_vmf):
       vmfinfo.entity_count = 0
       vmfinfo.face_count = 0
       
+      visgroups = (cxr_visgroup*len(cxr_visgroups))()
+      for i, vg in enumerate(cxr_visgroups):
+         visgroups[i].name = vg.encode('utf-8')
+      vmfinfo.visgroups = cast(visgroups, POINTER(cxr_visgroup))
+      vmfinfo.visgroup_count = len(cxr_visgroups)
+      
       libcxr_begin_vmf.call( pointer(vmfinfo), m.fp )
 
       def _buildsolid( cmd ):
@@ -1051,6 +1078,11 @@ def cxr_export_vmf(sceneinfo, output_vmf):
          vmfinfo.offset[1] = offset[1]
          vmfinfo.offset[2] = offset[2]
 
+         if cmd['object'].cxr_data.lightmap_override > 0:
+            vmfinfo.lightmap_scale = cmd['object'].cxr_data.lightmap_override
+         else:
+            vmfinfo.lightmap_scale = bpy.context.scene.cxr_data.lightmap_scale
+
          libcxr_push_world_vmf.call( world, pointer(vmfinfo), m.fp )
          libcxr_free_world.call( world )
 
@@ -1058,10 +1090,12 @@ def cxr_export_vmf(sceneinfo, output_vmf):
 
       # World geometry
       for brush in sceneinfo['geo']:
+         vmfinfo.visgroupid = int(brush['object'].cxr_data.visgroup)
          if not _buildsolid( brush ):
             cxr_batch_lines()
             scene_redraw()
             return False
+      vmfinfo.visgroupid = 0
 
       libcxr_vmf_begin_entities.call(pointer(vmfinfo), m.fp)
       
@@ -1085,12 +1119,21 @@ def cxr_export_vmf(sceneinfo, output_vmf):
             pass
          elif not isinstance( obj, bpy.types.Collection ):
             if obj.type == 'MESH':
+               vmfinfo.visgroupid = int(obj.cxr_data.visgroup)
                if not _buildsolid( ent ):
                   cxr_batch_lines()
                   scene_redraw()
                   return False
 
+         if obj != None:
+            m.node( 'editor' )
+            m.kv( 'visgroupid', str(obj.cxr_data.visgroup) )
+            m.kv( 'visgroupshown', '1' )
+            m.kv( 'visgroupautoshown', '1' )
+            m.edon()
+
          m.edon()
+      vmfinfo.visgroupid = 0
 
    print( "Done" )
    return True
@@ -1237,6 +1280,12 @@ def compile_material(mat):
       vmt.edon()
    return props
 
+def cxr_modelsrc_vphys( mdl ):
+   for obj in mdl.objects:
+      if obj.name == F"{mdl.name}_phy":
+         return obj
+   return None
+
 def cxr_export_modelsrc( mdl, origin, asset_dir, project_name, transform ):
    dgraph = bpy.context.evaluated_depsgraph_get()
 
@@ -1340,8 +1389,16 @@ def cxr_export_modelsrc( mdl, origin, asset_dir, project_name, transform ):
       o.write(F'$scale {transform["scale"]/100.0}\n')
       o.write(F'$body _ "{uid}_ref.fbx"\n')
       o.write(F'$staticprop\n')
-      o.write(F'$origin {origin[0]} {origin[1]} {origin[2]}\n')
+      o.write(F'$origin {origin[0]:.6f} {origin[1]:.6f} {origin[2]:.6f}\n')
       
+      if mdl.cxr_data.preserve_order:
+         o.write(F"$preservetriangleorder\n")
+
+      if mdl.cxr_data.texture_shadows:
+         o.write(F"$casttextureshadows\n")
+
+      o.write(F"$surfaceprop {mdl.cxr_data.surfaceprop}\n")
+
       if vphys != None:
          o.write(F'$collisionmodel "{uid}_phy.fbx"\n')
          o.write("{\n")
@@ -1435,7 +1492,8 @@ class CXR_PREVIEW_OPERATOR(bpy.types.Operator):
                "Internal-Fail",\
                "Non-Coplanar",\
                "Non-Convex Polygon",\
-               "Bad Result"]\
+               "Bad Result",\
+               "Invalid-Input"]\
                [err.value]
 
          if static.RUNNING:
@@ -1738,7 +1796,7 @@ class CXR_COMPILER_CHAIN(bpy.types.Operator):
          for img_job in image_jobs:
             img = img_job[0]
             fp.write(F"{asset_path('materials',img)}.vtf\n")
-            fp.write(F"{cxr_winepath(asset_full_path('materials',img))}.vmt\n")
+            fp.write(F"{cxr_winepath(asset_full_path('materials',img))}.vtf\n")
 
          for mdl in a_models:
             local = asset_path('models',mdl)
@@ -1752,6 +1810,10 @@ class CXR_COMPILER_CHAIN(bpy.types.Operator):
             fp.write(F"{winep}.mdl\n")
             fp.write(F"{local}.vvd\n")
             fp.write(F"{winep}.vvd\n")
+
+            if cxr_modelsrc_vphys(mdl):
+               fp.write(F"{local}.phy\n")
+               fp.write(F"{winep}.phy\n")
       
       # Convexer jobs
       static.JOBID = 0
@@ -1805,33 +1867,38 @@ class CXR_COMPILER_CHAIN(bpy.types.Operator):
 
       # VBSP stage
       if settings.comp_compile:
-         static.JOBINFO += [{
-            "title": "VBSP",
-            "w": 25,
-            "colour": (0.1,0.2,1.0,1.0),
-            "exec": "vbsp",
-            "jobs": [[settings[F'exe_vbsp']] + args],
-            "cwd": directory
-         }]
+         if not settings.opt_vbsp.startswith( 'disable' ):
+            vbsp_opt = settings.opt_vbsp.split()
+            static.JOBINFO += [{
+               "title": "VBSP",
+               "w": 25,
+               "colour": (0.1,0.2,1.0,1.0),
+               "exec": "vbsp",
+               "jobs": [[settings[F'exe_vbsp']] + vbsp_opt + args],
+               "cwd": directory
+            }]
          
-         static.JOBINFO += [{
-            "title": "VVIS",
-            "w": 25,
-            "colour": (0.9,0.5,0.5,1.0),
-            "exec": "vvis",
-            "jobs": [[settings[F'exe_vvis']] + ['-fast'] + args ],
-            "cwd": directory
-         }]
+         if not settings.opt_vvis.startswith( 'disable' ):
+            vvis_opt = settings.opt_vvis.split()
+            static.JOBINFO += [{
+               "title": "VVIS",
+               "w": 25,
+               "colour": (0.9,0.5,0.5,1.0),
+               "exec": "vvis",
+               "jobs": [[settings[F'exe_vvis']] + vvis_opt + args ],
+               "cwd": directory
+            }]
          
-         vrad_opt = settings.opt_vrad.split()
-         static.JOBINFO += [{
-            "title": "VRAD",
-            "w": 25,
-            "colour": (0.9,0.2,0.3,1.0),
-            "exec": "vrad",
-            "jobs": [[settings[F'exe_vrad']] + vrad_opt + args ],
-            "cwd": directory
-         }]
+         if not settings.opt_vrad.startswith( 'disable' ):
+            vrad_opt = settings.opt_vrad.split()
+            static.JOBINFO += [{
+               "title": "VRAD",
+               "w": 25,
+               "colour": (0.9,0.2,0.3,1.0),
+               "exec": "vrad",
+               "jobs": [[settings[F'exe_vrad']] + vrad_opt + args ],
+               "cwd": directory
+            }]
 
          static.JOBINFO += [{
             "title": "CXR",
@@ -1974,7 +2041,11 @@ class CXR_INTERFACE(bpy.types.Panel):
       box.operator("convexer.detect_compilers")
       box.prop(settings, "exe_studiomdl")
       box.prop(settings, "exe_vbsp")
+      box.prop(settings, "opt_vbsp")
+
       box.prop(settings, "exe_vvis")
+      box.prop(settings, "opt_vvis")
+
       box.prop(settings, "exe_vrad")
       box.prop(settings, "opt_vrad")
 
@@ -2108,7 +2179,7 @@ def cxr_entity_changeclass(_,context):
       entdef = cxr_entities[classname]
 
       kvs = entdef['keyvalues']
-      if callable(kvs): kvs = kvs(active_object)
+      if callable(kvs): kvs = kvs( {'object': active_object} )
 
       for k in kvs:
          kv = kvs[k]
@@ -2146,6 +2217,9 @@ class CXR_ENTITY_PANEL(bpy.types.Panel):
             _.layout.prop( active_object.cxr_data, 'brushclass' )
          else: _.layout.prop( active_object.cxr_data, 'classname' )
 
+         _.layout.prop( active_object.cxr_data, 'visgroup' )
+         _.layout.prop( active_object.cxr_data, 'lightmap_override' )
+
          if classname == 'NONE':
             return
       else: 
@@ -2194,6 +2268,26 @@ class CXR_LIGHT_PANEL(bpy.types.Panel):
          elif active_object.type == 'LIGHT_PROBE':
             layout.prop( properties, "size" )
 
+class CXR_COLLECTION_PANEL(bpy.types.Panel):
+   bl_label = "Source Settings"
+   bl_idname = "COL_PT_cxr"
+   bl_space_type = 'PROPERTIES'
+   bl_region_type = 'WINDOW'
+   bl_context = "collection"
+   
+   def draw(self, context):
+      layout = self.layout
+      scene = context.scene
+      
+      active_collection = bpy.context.collection
+      
+      if active_collection != None:
+         layout.prop( active_collection.cxr_data, "shadow_caster" )
+         layout.prop( active_collection.cxr_data, "texture_shadows" )
+         layout.prop( active_collection.cxr_data, "preserve_order" )
+         layout.prop( active_collection.cxr_data, "surfaceprop" )
+         layout.prop( active_collection.cxr_data, "visgroup" )
+
 # Settings groups
 # ------------------------------------------------------------------------------
 
@@ -2263,10 +2357,25 @@ class CXR_ENTITY_SETTINGS(bpy.types.PropertyGroup):
 
    brushclass: bpy.props.EnumProperty(items=enum_brushents, name="Class", \
          update=cxr_entity_changeclass, default='NONE' )
+   
+   enum_classes = [('0',"None","")]
+   for i, vg in enumerate(cxr_visgroups):
+      enum_classes += [(str(i+1),vg,"")]
+   visgroup: bpy.props.EnumProperty(name="visgroup",items=enum_classes,default=0)
+   lightmap_override: bpy.props.IntProperty(name="Lightmap Override",default=0)
 
 class CXR_MODEL_SETTINGS(bpy.types.PropertyGroup):
    last_hash: bpy.props.StringProperty( name="" )
    asset_id: bpy.props.IntProperty(name="vmf_settings",default=0)
+   shadow_caster: bpy.props.BoolProperty( name="Shadow caster", default=True )
+   texture_shadows: bpy.props.BoolProperty( name="Texture Shadows", default=False )
+   preserve_order: bpy.props.BoolProperty( name="Preserve Order", default=False )
+   surfaceprop: bpy.props.StringProperty( name="Suface prop",default="default" )
+
+   enum_classes = [('0',"None","")]
+   for i, vg in enumerate(cxr_visgroups):
+      enum_classes += [(str(i+1),vg,"")]
+   visgroup: bpy.props.EnumProperty(name="visgroup",items=enum_classes,default=0)
 
 class CXR_SCENE_SETTINGS(bpy.types.PropertyGroup):
    project_name: bpy.props.StringProperty( name="Project Name" )
@@ -2308,7 +2417,7 @@ classes = [ CXR_RELOAD, CXR_DEV_OPERATOR, CXR_INTERFACE, \
             CXR_LIGHT_SETTINGS, CXR_SCENE_SETTINGS, CXR_DETECT_COMPILERS,\
             CXR_ENTITY_PANEL, CXR_LIGHT_PANEL, CXR_PREVIEW_OPERATOR,\
             CXR_VIEW3D, CXR_COMPILER_CHAIN, CXR_RESET_HASHES,\
-            CXR_COMPILE_MATERIAL]
+            CXR_COMPILE_MATERIAL, CXR_COLLECTION_PANEL ]
 
 vmt_param_dynamic_class = None