("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)]
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):
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 ):
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 )
# 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)
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
# 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",
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")
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]
_.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:
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
# ------------------------------------------------------------------------------
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="" )
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" )
subdir: bpy.props.StringProperty( name="Subdirectory" )
projects / convexer.git / blobdiff