X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=__init__.py;h=6b6185cb6a208c2844e42d026110df0cc8997204;hb=2b81894272ade16dbe3f71514e8eb25b2962bf9e;hp=246fe95cd7463b608575d12e2b0abf76a5c47263;hpb=45f7d303989810f9bcedfd4a4fd6db49a5baba4e;p=convexer.git diff --git a/__init__.py b/__init__.py index 246fe95..6b6185c 100644 --- a/__init__.py +++ b/__init__.py @@ -1,4 +1,12 @@ -# Copyright (C) 2022 Harry Godden (hgn) +# CONVEXER v0.95 +# +# A GNU/Linux-first Source1 Hammer replacement +# built with Blender, for mapmakers +# +# Copyright (C) 2022 Harry Godden (hgn) +# +# LICENSE: GPLv3.0, please see COPYING and LICENSE for more information +# bl_info = { "name":"Convexer", @@ -20,6 +28,16 @@ from ctypes import * from gpu_extras.batch import batch_for_shader from bpy.app.handlers import persistent +# Setup platform dependent variables + +exec(open(F'{os.path.dirname(__file__)}/platform.py').read()) +if CXR_GNU_LINUX==1: + CXR_SHARED_EXT=".so" + CXR_EXE_EXT="" +else: + CXR_SHARED_EXT=".dll" + CXR_EXE_EXT=".exe" + # GPU and viewport drawing # ------------------------------------------------------------------------------ @@ -32,6 +50,7 @@ cxr_view_lines = None cxr_view_mesh = None cxr_jobs_batch = None cxr_jobs_inf = [] +cxr_error_inf = None # Shaders cxr_view_shader = gpu.shader.from_builtin('3D_SMOOTH_COLOR') @@ -62,13 +81,35 @@ void main() # Render functions # def cxr_ui(_,context): - global cxr_jobs_batch, cxr_ui_shader, cxr_jobs_inf + global cxr_jobs_batch, cxr_ui_shader, cxr_jobs_inf, cxr_error_inf w = gpu.state.viewport_get()[2] cxr_ui_shader.bind() cxr_ui_shader.uniform_float( "scale", w ) - if cxr_jobs_batch != None: + if cxr_error_inf != None: + err_begin = 50 + + if isinstance(cxr_error_inf[1],list): + err_begin += 20*(len(cxr_error_inf[1])-1) + + blf.position(0,2,err_begin,0) + blf.size(0,50,48) + blf.color(0, 1.0,0.2,0.2,0.9) + blf.draw(0,cxr_error_inf[0]) + + blf.size(0,50,24) + blf.color(0, 1.0,1.0,1.0,1.0) + + if isinstance(cxr_error_inf[1],list): + for i,inf in enumerate(cxr_error_inf[1]): + blf.position(0,2,err_begin-30-i*20,0) + blf.draw(0,inf) + else: + blf.position(0,2,err_begin-30,0) + blf.draw(0,cxr_error_inf[1]) + + elif cxr_jobs_batch != None: gpu.state.blend_set('ALPHA') cxr_jobs_batch.draw(cxr_ui_shader) @@ -89,12 +130,6 @@ def cxr_ui(_,context): blf.draw(0,ln[:-1]) py += 16 - #if CXR_PREVIEW_OPERATOR.LASTERR != None: - # blf.position(0,2,80,0) - # blf.size(0,50,48) - # blf.color(0,1.0,0.2,0.2,0.9) - # blf.draw(0,"Invalid geometry") - # Something is off with TIMER, # this forces the viewport to redraw before we can continue with our # compilation stuff. @@ -186,10 +221,11 @@ def scene_redraw(): # Shared libraries # ------------------------------------------------------------------------------ -# dlclose for reloading modules manually -libc_dlclose = None -libc_dlclose = cdll.LoadLibrary(None).dlclose -libc_dlclose.argtypes = [c_void_p] +if CXR_GNU_LINUX==1: + # dlclose for reloading modules manually + libc_dlclose = None + libc_dlclose = cdll.LoadLibrary(None).dlclose + libc_dlclose.argtypes = [c_void_p] # wrapper for ctypes binding class extern(): @@ -216,7 +252,8 @@ libcxr = None class cxr_edge(Structure): _fields_ = [("i0",c_int32), ("i1",c_int32), - ("freestyle",c_int32)] + ("freestyle",c_int32), + ("sharp",c_int32)] class cxr_static_loop(Structure): _fields_ = [("index",c_int32), @@ -254,14 +291,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)] @@ -327,6 +370,7 @@ def mesh_cxr_format(obj): edge_data[i].i0 = edge.vertices[0] edge_data[i].i1 = edge.vertices[1] edge_data[i].freestyle = edge.use_freestyle_mark + edge_data[i].sharp = edge.use_edge_sharp material_data = (cxr_material*len(obj.material_slots))() @@ -464,14 +508,26 @@ def libcxr_line_callback( p0,p1,colour ): cxr_line_colours += [(colour[0],colour[1],colour[2],colour[3])] cxr_line_colours += [(colour[0],colour[1],colour[2],colour[3])] +def cxr_reset_all(): + global cxr_jobs_inf, cxr_jobs_batch, cxr_error_inf, cxr_view_mesh + cxr_jobs_inf = None + cxr_jobs_batch = None + cxr_error_inf = None + + cxr_reset_lines() + cxr_batch_lines() + cxr_view_mesh = None + + scene_redraw() + # libnbvtf # ------------------------------------------------------------------------------ libnbvtf = None # Constants -NBVTF_IMAGE_FORMAT_RGBA8888 = 0 -NBVTF_IMAGE_FORMAT_RGB888 = 2 +NBVTF_IMAGE_FORMAT_ABGR8888 = 1 +NBVTF_IMAGE_FORMAT_BGR888 = 3 NBVTF_IMAGE_FORMAT_DXT1 = 13 NBVTF_IMAGE_FORMAT_DXT5 = 15 NBVTF_TEXTUREFLAGS_CLAMPS = 0x00000004 @@ -495,12 +551,15 @@ def shared_reload(): # Unload libraries if existing def _reload( lib, path ): - if lib != None: - _handle = lib._handle - for i in range(10): libc_dlclose( _handle ) - lib = None - del lib - return cdll.LoadLibrary( F'{os.path.dirname(__file__)}/{path}.so' ) + if CXR_GNU_LINUX==1: + if lib != None: + _handle = lib._handle + for i in range(10): libc_dlclose( _handle ) + lib = None + del lib + + libpath = F'{os.path.dirname(__file__)}/{path}{CXR_SHARED_EXT}' + return cdll.LoadLibrary( libpath ) libnbvtf = _reload( libnbvtf, "libnbvtf" ) libcxr = _reload( libcxr, "libcxr" ) @@ -554,6 +613,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): @@ -561,26 +630,31 @@ def ent_lights(context): kvs = cxr_baseclass([ent_origin],\ { "_distance": (0.0 if obj.data.cxr_data.realtime else -1.0), - "_light": [int(pow(obj.data.color[i],1.0/2.2)*255.0) for i in range(3)] +\ - [int(obj.data.energy * bpy.context.scene.cxr_data.light_scale)], "_lightHDR": '-1 -1 -1 1', "_lightscaleHDR": 1 }) - - if obj.data.type == 'SPOT': - kvs['_cone'] = obj.data.spot_size*(57.295779513/2.0) - kvs['_inner_cone'] = (1.0-obj.data.spot_blend)*kvs['_cone'] - # Blenders spotlights are -z forward + light_base = [(pow(obj.data.color[i],1.0/2.2)*255.0) for i in range(3)] +\ + [obj.data.energy * bpy.context.scene.cxr_data.light_scale] + + if obj.data.type == 'SPOT' or obj.data.type == 'SUN': + # Blenders directional lights are -z forward # Source is +x, however, it seems to use a completely different system. # Since we dont care about roll for spotlights, we just take the # pitch and yaw via trig _,mtx_rot,_ = obj.matrix_world.decompose() fwd = mtx_rot @ mathutils.Vector((0,0,-1)) + dir_pitch = math.asin(fwd[2]) * 57.295779513 + dir_yaw = math.atan2(fwd[1],fwd[0]) * 57.295779513 + + if obj.data.type == 'SPOT': + kvs['_light'] = [ int(x) for x in light_base ] + kvs['_cone'] = obj.data.spot_size*(57.295779513/2.0) + kvs['_inner_cone'] = (1.0-obj.data.spot_blend)*kvs['_cone'] - kvs['pitch'] = math.asin(fwd[2]) * 57.295779513 - kvs['angles'] = [ 0.0, math.atan2(fwd[1],fwd[0]) * 57.295779513, 0.0 ] + kvs['pitch'] = dir_pitch + kvs['angles'] = [ 0, dir_yaw, 0 ] kvs['_quadratic_attn'] = 0.0 # Source spotlights + quadratic falloff look # Really bad... # @@ -589,34 +663,82 @@ def ent_lights(context): kvs['_linear_attn'] = 1.0 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': - pass # TODO + light_base[3] *= 300.0 * 5 + kvs['_light'] = [ int(x) for x in light_base ] + + ambient = bpy.context.scene.world.color + kvs['_ambient'] = [int(pow(ambient[i],1.0/2.2)*255.0) for i in range(3)] +\ + [80 * 5] + kvs['_ambientHDR'] = [-1,-1,-1,1] + kvs['_AmbientScaleHDR'] = 1 + kvs['pitch'] = dir_pitch + kvs['angles'] = [ dir_pitch, dir_yaw, 0.0 ] + kvs['SunSpreadAngle'] = 0 return kvs def ent_prop(context): - kvs = {} if isinstance( context['object'], bpy.types.Collection ): + kvs = {} + target = context['object'] + pos = mathutils.Vector(context['origin']) + pos += mathutils.Vector(context['transform']['offset']) + + 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 + + obj = context['object'] + euler = [ a*57.295779513 for a in obj.rotation_euler ] + angle = [0,0,0] + angle[0] = euler[1] + angle[1] = euler[2] + 180.0 # Dunno... + angle[2] = euler[0] + + kvs['angles'] = angle + kvs['uniformscale'] = obj.scale[0] + + if target.cxr_data.shadow_caster: kvs['enablelightbounce'] = 1 kvs['disableshadows'] = 0 - kvs['fademindist'] = -1 - kvs['fadescale'] = 1 - kvs['model'] = F"{asset_path('models',context['object'])}.mdl".lower() - kvs['renderamt'] = 255 - kvs['rendercolor'] = [255, 255, 255] - kvs['skin'] = 0 - kvs['solid'] = 6 - kvs['uniformscale'] = 1.0 + else: + kvs['enablelightbounce'] = 0 + kvs['disableshadows'] = 1 - pos = mathutils.Vector(context['origin']) - pos += mathutils.Vector(context['transform']['offset']) + kvs['fademindist'] = -1 + kvs['fadescale'] = 1 + kvs['model'] = F"{asset_path('models',target)}.mdl".lower() + kvs['renderamt'] = 255 + kvs['rendercolor'] = [255, 255, 255] + kvs['skin'] = 0 + kvs['solid'] = 6 - kvs['origin'] = [pos[1],-pos[0],pos[2]] + return kvs +def ent_sky_camera(context): + settings = bpy.context.scene.cxr_data + scale = settings.scale_factor / settings.skybox_scale_factor + + kvs = { + "origin": [_ for _ in context['transform']['offset']], + "angles": [ 0, 0, 0 ], + "fogcolor": [255, 255, 255], + "fogcolor2": [255, 255, 255], + "fogdir": [1,0,0], + "fogend": 2000.0, + "fogmaxdensity": 1, + "fogstart": 500.0, + "HDRColorScale": 1.0, + "scale": scale + } return kvs def ent_cubemap(context): @@ -660,7 +782,7 @@ def asset_uid(asset): name = "" if v == 0: - name = "A" + name = "a" else: dig = [] @@ -689,15 +811,91 @@ def asset_full_path(sdir,asset): return F"{bpy.context.scene.cxr_data.subdir}/"+\ F"{asset_path(sdir,asset_uid(asset))}" +# Decomposes mesh, and sets global error information if failed. +# - returns None on fail +# - returns world on success +def cxr_decompose_globalerr( mesh_src ): + global cxr_error_inf + + err = c_int32(0) + world = libcxr_decompose.call( mesh_src, pointer(err) ) + + if world == None: + cxr_view_mesh = None + cxr_batch_lines() + + cxr_error_inf = [\ + ("No Error", "There is no error?"),\ + ("Bad input", "Non manifold geometry is present in the input mesh"),\ + ("Bad result","An invalid manifold was generated, try to simplify"),\ + ("Bad result","Make sure there is a clear starting point"),\ + ("Bad result","Implicit vertex was invalid, try to simplify"),\ + ("Bad input","Non coplanar vertices are in the source mesh"),\ + ("Bad input","Non convex polygon is in the source mesh"),\ + ("Bad result","Undefined failure"),\ + ("Invalid Input", "Undefined failure"),\ + ][err.value] + + scene_redraw() + + return world + # Entity functions / infos # ------------------------ +def cxr_collection_purpose(collection): + if collection.name.startswith('.'): return None + if collection.hide_render: return None + if collection.name.startswith('mdl_'): return 'model' + return 'group' + +def cxr_object_purpose(obj): + objpurpose = None + group = None + + def _search(collection): + nonlocal objpurpose, group, obj + + purpose = cxr_collection_purpose( collection ) + if purpose == None: return + if purpose == 'model': + for o in collection.objects: + if o == obj: + if o.type != 'EMPTY': + objpurpose = 'model' + group = collection + return + return + for o in collection.objects: + if o == obj: + classname = cxr_classname(o) + if classname != None: + objpurpose = 'entity' + if o.type == 'MESH': + objpurpose = 'brush_entity' + group = collection + else: + if o.type == 'MESH': + objpurpose = 'brush' + group = collection + return + for c in collection.children: + _search(c) + + if 'main' in bpy.data.collections: + _search( bpy.data.collections['main'] ) + + if objpurpose == None and 'skybox' in bpy.data.collections: + _search( bpy.data.collections['skybox'] ) + + return (group,objpurpose) + def cxr_intrinsic_classname(obj): if obj.type == 'LIGHT': return { 'SPOT': "light_spot", 'POINT': "light", - 'SUN': "light_directional" }[ obj.data.type ] + 'SUN': "light_environment" }[ obj.data.type ] elif obj.type == 'LIGHT_PROBE': return "env_cubemap" @@ -897,11 +1095,10 @@ def cxr_scene_collect(): def _collect(collection,transform): nonlocal sceneinfo - - if collection.name.startswith('.'): return - if collection.hide_render: return - - if collection.name.startswith('mdl_'): + + purpose = cxr_collection_purpose( collection ) + if purpose == None: return + if purpose == 'model': sceneinfo['entities'] += [{ "object": collection, "classname": "prop_static", @@ -952,6 +1149,12 @@ def cxr_scene_collect(): if 'skybox' in bpy.data.collections: _collect( bpy.data.collections['skybox'], transform_sky ) + sceneinfo['entities'] += [{ + "object": None, + "transform": transform_sky, + "classname": "sky_camera" + }] + return sceneinfo # Write VMF out to file (JOB HANDLER) @@ -966,7 +1169,7 @@ def cxr_export_vmf(sceneinfo, output_vmf): vmfinfo.mapversion = 4 #TODO: These need to be in options... - vmfinfo.skyname = b"sky_csgo_night02b" + vmfinfo.skyname = bpy.context.scene.cxr_data.skyname.encode('utf-8') vmfinfo.detailvbsp = b"detail.vbsp" vmfinfo.detailmaterial = b"detail/detailsprites" vmfinfo.lightmap_scale = 12 @@ -975,6 +1178,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 ): @@ -983,7 +1192,7 @@ def cxr_export_vmf(sceneinfo, output_vmf): print( F"{vmfinfo.brush_count} :: {cmd['object'].name}" ) baked = mesh_cxr_format( cmd['object'] ) - world = libcxr_decompose.call( baked, None ) + world = cxr_decompose_globalerr( baked ) if world == None: return False @@ -995,6 +1204,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 ) @@ -1002,10 +1216,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) @@ -1025,14 +1241,25 @@ def cxr_export_vmf(sceneinfo, output_vmf): m.kv( kv[0], ' '.join([str(_) for _ in kv[2]]) ) else: m.kv( kv[0], str(kv[2]) ) - if not isinstance( obj, bpy.types.Collection ): + if obj == None: + 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 @@ -1048,10 +1275,10 @@ def compile_image(img): dims = img.cxr_data.export_res fmt = { - 'RGBA': NBVTF_IMAGE_FORMAT_RGBA8888, + 'RGBA': NBVTF_IMAGE_FORMAT_ABGR8888, 'DXT1': NBVTF_IMAGE_FORMAT_DXT1, 'DXT5': NBVTF_IMAGE_FORMAT_DXT5, - 'RGB': NBVTF_IMAGE_FORMAT_RGB888 + 'RGB': NBVTF_IMAGE_FORMAT_BGR888 }[ img.cxr_data.fmt ] mipmap = img.cxr_data.mipmap @@ -1179,6 +1406,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() @@ -1233,8 +1466,13 @@ def cxr_export_modelsrc( mdl, origin, asset_dir, project_name, transform ): # Collect materials to be compiled, and temp rename for export mat_dict = {} - + + vphys = None for obj in mdl.objects: + if obj.name == F"{mdl.name}_phy": + vphys = obj + continue + obj.select_set(state=True) for ms in obj.material_slots: if ms.material != None: @@ -1251,6 +1489,18 @@ def cxr_export_modelsrc( mdl, origin, asset_dir, project_name, transform ): bake_space_transform=False ) + bpy.ops.object.select_all(action='DESELECT') + + if vphys != None: + vphys.select_set(state=True) + bpy.ops.export_scene.fbx( filepath=F'{asset_dir}/{uid}_phy.fbx',\ + check_existing=False, + use_selection=True, + apply_unit_scale=False, + bake_space_transform=False + ) + bpy.ops.object.select_all(action='DESELECT') + # Fix material names back to original for mat in mat_dict: mat.name = mat_dict[mat] @@ -1265,9 +1515,22 @@ 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") + o.write(" $concave\n") + o.write("}\n") - #TODO: vphys o.write(F'$cdmaterials {project_name}\n') o.write(F'$sequence idle {uid}_ref.fbx\n') @@ -1292,6 +1555,15 @@ class CXR_RELOAD(bpy.types.Operator): shared_reload() return {'FINISHED'} +# Reset all debugging/ui information +# +class CXR_RESET(bpy.types.Operator): + bl_idname="convexer.reset" + bl_label="Reset Convexer" + def execute(_,context): + cxr_reset_all() + return {'FINISHED'} + # Used for exporting data to use with ASAN builds # class CXR_DEV_OPERATOR(bpy.types.Operator): @@ -1310,59 +1582,21 @@ class CXR_PREVIEW_OPERATOR(bpy.types.Operator): bl_idname="convexer.preview" bl_label="Preview Brushes" - LASTERR = None RUNNING = False def execute(_,context): - return {'FINISHED'} - - def modal(_,context,event): global cxr_view_mesh - static = _.__class__ - - if event.type == 'ESC': - cxr_reset_lines() - cxr_batch_lines() - cxr_view_mesh = None - static.RUNNING = False - - scene_redraw() - return {'FINISHED'} - - return {'PASS_THROUGH'} + global cxr_view_shader, cxr_view_mesh, cxr_error_inf + + cxr_reset_all() - def invoke(_,context,event): - global cxr_view_shader, cxr_view_mesh static = _.__class__ - static.LASTERR = None - - cxr_reset_lines() mesh_src = mesh_cxr_format(context.active_object) - - err = c_int32(0) - world = libcxr_decompose.call( mesh_src, pointer(err) ) + world = cxr_decompose_globalerr( mesh_src ) if world == None: - cxr_view_mesh = None - cxr_batch_lines() - scene_redraw() - - static.LASTERR = ["There is no error", \ - "Non-Manifold",\ - "Bad-Manifold",\ - "No-Candidate",\ - "Internal-Fail",\ - "Non-Coplanar",\ - "Non-Convex Polygon",\ - "Bad Result"]\ - [err.value] - - if static.RUNNING: - return {'CANCELLED'} - else: - context.window_manager.modal_handler_add(_) - return {'RUNNING_MODAL'} + return {'FINISHED'} # Generate preview using cxr # @@ -1389,15 +1623,8 @@ class CXR_PREVIEW_OPERATOR(bpy.types.Operator): libcxr_free_world.call( world ) cxr_batch_lines() scene_redraw() - - # Allow user to spam the operator - if static.RUNNING: - return {'CANCELLED'} - - if not static.RUNNING: - static.RUNNING = True - context.window_manager.modal_handler_add(_) - return {'RUNNING_MODAL'} + + return {'FINISHED'} # Search for VMF compiler executables in subdirectory # @@ -1417,6 +1644,30 @@ class CXR_DETECT_COMPILERS(bpy.types.Operator): return {'FINISHED'} +def cxr_compiler_path( compiler ): + settings = bpy.context.scene.cxr_data + subdir = settings.subdir + path = os.path.normpath(F'{subdir}/../bin/{compiler}.exe') + + if os.path.exists( path ): return path + else: return None + +# Compatibility layer +# +def cxr_temp_file( fn ): + if CXR_GNU_LINUX == 1: + return F"/tmp/fn" + else: + filepath = bpy.data.filepath + directory = os.path.dirname(filepath) + return F"{directory}/{fn}.txt" + +def cxr_winepath( path ): + if CXR_GNU_LINUX == 1: + return 'z:'+path.replace('/','\\') + else: + return path + # Main compile function # class CXR_COMPILER_CHAIN(bpy.types.Operator): @@ -1437,7 +1688,7 @@ class CXR_COMPILER_CHAIN(bpy.types.Operator): JOBSYS = None def cancel(_,context): - global cxr_jobs_batch + #global cxr_jobs_batch static = _.__class__ wm = context.window_manager @@ -1451,7 +1702,7 @@ class CXR_COMPILER_CHAIN(bpy.types.Operator): static.FILE.close() - cxr_jobs_batch = None + #cxr_jobs_batch = None scene_redraw() return {'FINISHED'} @@ -1459,7 +1710,7 @@ class CXR_COMPILER_CHAIN(bpy.types.Operator): static = _.__class__ if ev.type == 'TIMER': - global cxr_jobs_batch + global cxr_jobs_batch, cxr_error_inf if static.WAIT_REDRAW: scene_redraw() @@ -1473,15 +1724,16 @@ class CXR_COMPILER_CHAIN(bpy.types.Operator): if static.SUBPROC != None: # Deal with async modes status = static.SUBPROC.poll() - if status == None: - # Cannot redirect STDOUT through here without causing - # undefined behaviour due to the Blender Python specification. - # - # Have to write it out to a file and read it back in. - # - with open("/tmp/convexer_compile_log.txt","r") as log: - static.LOG = log.readlines() + # Cannot redirect STDOUT through here without causing + # undefined behaviour due to the Blender Python specification. + # + # Have to write it out to a file and read it back in. + # + + with open(cxr_temp_file("convexer_compile_log.txt"),"r") as log: + static.LOG = log.readlines() + if status == None: return {'PASS_THROUGH'} else: #for l in static.SUBPROC.stdout: @@ -1490,6 +1742,10 @@ class CXR_COMPILER_CHAIN(bpy.types.Operator): if status != 0: print(F'Compiler () error: {status}') + + jobn = static.JOBSYS['jobs'][static.JOBID] + cxr_error_inf = ( F"{static.JOBSYS['title']} error {status}", jobn ) + return _.cancel(context) static.JOBSYS['jobs'][static.JOBID] = None @@ -1526,9 +1782,8 @@ class CXR_COMPILER_CHAIN(bpy.types.Operator): # All completed print( "All jobs completed!" ) - cxr_jobs_batch = None - - scene_redraw() + #cxr_jobs_batch = None + #scene_redraw() return _.cancel(context) return {'PASS_THROUGH'} @@ -1537,178 +1792,251 @@ class CXR_COMPILER_CHAIN(bpy.types.Operator): static = _.__class__ wm = context.window_manager - if static.TIMER == None: - print("Launching compiler toolchain") + if static.TIMER != None: + print("Chain exiting...") + static.USER_EXIT=True + return {'RUNNING_MODAL'} - # Run static compilation units now (collect, vmt..) - filepath = bpy.data.filepath - directory = os.path.dirname(filepath) - settings = bpy.context.scene.cxr_data - - asset_dir = F"{directory}/modelsrc" - material_dir = F"{settings.subdir}/materials/{settings.project_name}" - model_dir = F"{settings.subdir}/models/{settings.project_name}" - output_vmf = F"{directory}/{settings.project_name}.vmf" - - os.makedirs( asset_dir, exist_ok=True ) - os.makedirs( material_dir, exist_ok=True ) - os.makedirs( model_dir, exist_ok=True ) - - static.FILE = open(F"/tmp/convexer_compile_log.txt","w") - static.LOG = [] + print("Launching compiler toolchain") + cxr_reset_all() + + # Run static compilation units now (collect, vmt..) + filepath = bpy.data.filepath + directory = os.path.dirname(filepath) + settings = bpy.context.scene.cxr_data + + asset_dir = F"{directory}/modelsrc" + material_dir = F"{settings.subdir}/materials/{settings.project_name}" + model_dir = F"{settings.subdir}/models/{settings.project_name}" + output_vmf = F"{directory}/{settings.project_name}.vmf" + + bsp_local = F"{directory}/{settings.project_name}.bsp" + bsp_remote = F"{settings.subdir}/maps/{settings.project_name}.bsp" + bsp_packed = F"{settings.subdir}/maps/{settings.project_name}_pack.bsp" + packlist = F"{directory}/{settings.project_name}_assets.txt" - sceneinfo = cxr_scene_collect() - image_jobs = [] - qc_jobs = [] + os.makedirs( asset_dir, exist_ok=True ) + os.makedirs( material_dir, exist_ok=True ) + os.makedirs( model_dir, exist_ok=True ) + + static.FILE = open(cxr_temp_file("convexer_compile_log.txt"),"w") + static.LOG = [] + + sceneinfo = cxr_scene_collect() + image_jobs = [] + qc_jobs = [] - # Collect materials - a_materials = set() - for brush in sceneinfo['geo']: - for ms in brush['object'].material_slots: + # Collect materials + a_materials = set() + for brush in sceneinfo['geo']: + for ms in brush['object'].material_slots: + a_materials.add( ms.material ) + if ms.material.cxr_data.shader == 'VertexLitGeneric': + errmat = ms.material.name + errnam = brush['object'].name + print( F"Vertex shader {errmat} used on {errnam}") + return {'CANCELLED'} + + a_models = set() + model_jobs = [] + for ent in sceneinfo['entities']: + if ent['object'] == None: continue + + if ent['classname'] == 'prop_static': + obj = ent['object'] + if isinstance(obj,bpy.types.Collection): + target = obj + a_models.add( target ) + model_jobs += [(target, ent['origin'], asset_dir, \ + settings.project_name, ent['transform'])] + else: + target = obj.instance_collection + if target in a_models: + continue + a_models.add( target ) + + # TODO: Should take into account collection instancing offset + model_jobs += [(target, [0,0,0], asset_dir, \ + settings.project_name, ent['transform'])] + + elif ent['object'].type == 'MESH': + for ms in ent['object'].material_slots: a_materials.add( ms.material ) - if ms.material.cxr_data.shader == 'VertexLitGeneric': + + for mdl in a_models: + uid = asset_uid(mdl) + qc_jobs += [F'{uid}.qc'] + + for obj in mdl.objects: + for ms in obj.material_slots: + a_materials.add( ms.material ) + if ms.material.cxr_data.shader == 'LightMappedGeneric' or \ + ms.material.cxr_data.shader == 'WorldVertexTransition': + errmat = ms.material.name - errnam = brush['object'].name - print( F"Vertex shader {errmat} used on {errnam}") + errnam = obj.name + print( F"Lightmapped shader {errmat} used on {errnam}") return {'CANCELLED'} - - for ent in sceneinfo['entities']: - if isinstance(ent['object'],bpy.types.Collection): continue + + # Collect images + for mat in a_materials: + for pair in compile_material(mat): + decl = pair[0] + pdef = pair[1] + prop = pair[2] + + if isinstance(prop,bpy.types.Image): + flags = 0 + if 'flags' in pdef: flags = pdef['flags'] + if prop not in image_jobs: + image_jobs += [(prop,)] + prop.cxr_data.flags = flags + + # Create packlist + with open( packlist, "w" ) as fp: - if ent['object'].type == 'MESH': - for ms in ent['object'].material_slots: - a_materials.add( ms.material ) - - # TODO.. this should just be in the entity loop - for hero in sceneinfo['heros']: - uid = asset_uid(hero['collection']) - qc_jobs += [F'{uid}.qc'] - for obj in hero['collection'].objects: - for ms in obj.material_slots: - a_materials.add( ms.material ) - if ms.material.cxr_data.shader == 'LightMappedGeneric' or \ - ms.material.cxr_data.shader == 'WorldVertexTransition': - - errmat = ms.material.name - errnam = obj.name - print( F"Lightmapped shader {errmat} used on {errnam}") - return {'CANCELLED'} - - # Collect images for mat in a_materials: - for pair in compile_material(mat): - decl = pair[0] - pdef = pair[1] - prop = pair[2] - - if isinstance(prop,bpy.types.Image): - flags = 0 - if 'flags' in pdef: flags = pdef['flags'] - if prop not in image_jobs: - image_jobs += [(prop,)] - prop.cxr_data.flags = flags - - # Convexer jobs - static.JOBID = 0 - static.JOBINFO = [] - - if settings.comp_vmf: - static.JOBINFO += [{ - "title": "Convexer", + if mat.cxr_data.shader == 'Builtin': continue + fp.write(F"{asset_path('materials',mat)}.vmt\n") + fp.write(F"{cxr_winepath(asset_full_path('materials',mat))}.vmt\n") + + 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))}.vtf\n") + + for mdl in a_models: + local = asset_path('models',mdl) + winep = cxr_winepath(asset_full_path('models',mdl)) + + fp.write(F"{local}.vvd\n") + fp.write(F"{winep}.vvd\n") + fp.write(F"{local}.dx90.vtx\n") + fp.write(F"{winep}.dx90.vtx\n") + fp.write(F"{local}.mdl\n") + 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 + static.JOBINFO = [] + + if settings.comp_vmf: + static.JOBINFO += [{ + "title": "Convexer", + "w": 20, + "colour": (0.863, 0.078, 0.235,1.0), + "exec": cxr_export_vmf, + "jobs": [(sceneinfo,output_vmf)] + }] + + if settings.comp_textures: + if len(image_jobs) > 0: + static.JOBINFO += [{ + "title": "Textures", + "w": 40, + "colour": (1.000, 0.271, 0.000,1.0), + "exec": compile_image, + "jobs": image_jobs + }] + + game = cxr_winepath( settings.subdir ) + args = [ \ + '-game', game, settings.project_name + ] + + # FBX stage + if settings.comp_models: + if len(model_jobs) > 0: + static.JOBINFO += [{ + "title": "Batches", + "w": 25, + "colour": (1.000, 0.647, 0.000,1.0), + "exec": cxr_export_modelsrc, + "jobs": model_jobs + }] + + if len(qc_jobs) > 0: + static.JOBINFO += [{ + "title": "StudioMDL", "w": 20, - "colour": (1.0,0.3,0.1,1.0), - "exec": cxr_export_vmf, - "jobs": [(sceneinfo,output_vmf)] + "colour": (1.000, 0.843, 0.000, 1.0), + "exec": "studiomdl", + "jobs": [[settings[F'exe_studiomdl']] + [\ + '-nop4', '-game', game, qc] for qc in qc_jobs], + "cwd": asset_dir }] - - if settings.comp_textures: - if len(image_jobs) > 0: - static.JOBINFO += [{ - "title": "Textures", - "w": 40, - "colour": (0.1,1.0,0.3,1.0), - "exec": compile_image, - "jobs": image_jobs - }] - - game = 'z:'+settings.subdir.replace('/','\\') - args = [ \ - '-game', game, settings.project_name - ] - - # FBX stage - if settings.comp_models: - if len(sceneinfo['heros']) > 0: - static.JOBINFO += [{ - "title": "Batches", - "w": 25, - "colour": (0.5,0.5,1.0,1.0), - "exec": cxr_export_modelsrc, - "jobs": [(h['collection'], h['origin'], asset_dir, \ - settings.project_name, h['transform']) for h in \ - sceneinfo['heros']] - }] - - if len(qc_jobs) > 0: - static.JOBINFO += [{ - "title": "StudioMDL", - "w": 20, - "colour": (0.8,0.1,0.1,1.0), - "exec": "studiomdl", - "jobs": [[settings[F'exe_studiomdl']] + [\ - '-nop4', '-game', game, qc] for qc in qc_jobs], - "cwd": asset_dir - }] - - # VBSP stage - if settings.comp_compile: + + # VBSP stage + if settings.comp_compile: + 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), + "colour": (0.678, 1.000, 0.184,1.0), "exec": "vbsp", - "jobs": [[settings[F'exe_vbsp']] + args], + "jobs": [[settings[F'exe_vbsp']] + vbsp_opt + 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), + "colour": (0.000, 1.000, 0.498,1.0), "exec": "vvis", - "jobs": [[settings[F'exe_vvis']] + ['-fast'] + args ], + "jobs": [[settings[F'exe_vvis']] + vvis_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), + "colour": (0.125, 0.698, 0.667,1.0), "exec": "vrad", "jobs": [[settings[F'exe_vrad']] + vrad_opt + args ], "cwd": directory }] - static.JOBINFO += [{ - "title": "CXR", - "w": 5, - "colour": (0.0,1.0,0.4,1.0), - "exec": cxr_patchmap, - "jobs": [(F"{directory}/{settings.project_name}.bsp",\ - F"{settings.subdir}/maps/{settings.project_name}.bsp")] - }] + static.JOBINFO += [{ + "title": "CXR", + "w": 5, + "colour": (0.118, 0.565, 1.000,1.0), + "exec": cxr_patchmap, + "jobs": [(bsp_local,bsp_remote)] + }] - static.USER_EXIT=False - static.TIMER=wm.event_timer_add(0.1,window=context.window) - wm.modal_handler_add(_) + if settings.comp_pack: + static.JOBINFO += [{ + "title": "Pack", + "w": 5, + "colour": (0.541, 0.169, 0.886,1.0), + "exec": "bspzip", + "jobs": [[cxr_compiler_path("bspzip"), '-addlist', \ + cxr_winepath(bsp_remote), + cxr_winepath(packlist), + cxr_winepath(bsp_packed) ]], + "cwd": directory + }] - cxr_jobs_update_graph( static.JOBINFO ) - scene_redraw() - return {'RUNNING_MODAL'} + if len(static.JOBINFO) == 0: + return {'CANCELLED'} + + static.USER_EXIT=False + static.TIMER=wm.event_timer_add(0.1,window=context.window) + wm.modal_handler_add(_) - print("Chain exiting...") - static.USER_EXIT=True + cxr_jobs_update_graph( static.JOBINFO ) + scene_redraw() return {'RUNNING_MODAL'} class CXR_RESET_HASHES(bpy.types.Operator): @@ -1726,6 +2054,40 @@ class CXR_RESET_HASHES(bpy.types.Operator): return {'FINISHED'} +class CXR_COMPILE_MATERIAL(bpy.types.Operator): + bl_idname="convexer.matcomp" + bl_label="Recompile Material" + + def execute(_,context): + active_obj = bpy.context.active_object + active_mat = active_obj.active_material + + #TODO: reduce code dupe (L1663) + for pair in compile_material(active_mat): + decl = pair[0] + pdef = pair[1] + prop = pair[2] + + if isinstance(prop,bpy.types.Image): + flags = 0 + if 'flags' in pdef: flags = pdef['flags'] + prop.cxr_data.flags = flags + + compile_image( prop ) + + settings = bpy.context.scene.cxr_data + with open(F'{settings.subdir}/cfg/convexer_mat_update.cfg','w') as o: + o.write(F'mat_reloadmaterial {asset_name(active_mat)}') + + # TODO: Move this + with open(F'{settings.subdir}/cfg/convexer.cfg','w') as o: + o.write('sv_cheats 1\n') + o.write('mp_warmup_pausetimer 1\n') + o.write('bot_kick\n') + o.write('alias cxr_reload "exec convexer_mat_update"\n') + + return {'FINISHED'} + # Convexer panels # ------------------------------------------------------------------------------ @@ -1738,19 +2100,34 @@ class CXR_VIEW3D( bpy.types.Panel ): bl_region_type = 'UI' bl_category = "Convexer" - @classmethod - def poll(cls, context): - return (context.object is not None) - def draw(_, context): layout = _.layout + + active_object = context.object + if active_object == None: return + + purpose = cxr_object_purpose( active_object ) + + if purpose[0] == None or purpose[1] == None: + usage_str = "No purpose" + else: + if purpose[1] == 'model': + usage_str = F'mesh in {asset_name( purpose[0] )}.mdl' + else: + usage_str = F'{purpose[1]} in {purpose[0].name}' + + layout.label(text=F"Currently editing:") + box = layout.box() + box.label(text=usage_str) + + if purpose[1] == 'brush' or purpose[1] == 'brush_entity': + row = layout.row() + row.scale_y = 2 + row.operator("convexer.preview") + row = layout.row() row.scale_y = 2 - row.operator("convexer.preview") - - if CXR_PREVIEW_OPERATOR.LASTERR != None: - box = layout.box() - box.label(text=CXR_PREVIEW_OPERATOR.LASTERR, icon='ERROR') + row.operator("convexer.reset") # Main scene properties interface, where all the settings go # @@ -1762,15 +2139,16 @@ class CXR_INTERFACE(bpy.types.Panel): bl_context="scene" def draw(_,context): - _.layout.operator("convexer.reload") - _.layout.operator("convexer.dev_test") - _.layout.operator("convexer.preview") - _.layout.operator("convexer.hash_reset") + if CXR_GNU_LINUX==1: + _.layout.operator("convexer.reload") + _.layout.operator("convexer.dev_test") + _.layout.operator("convexer.hash_reset") settings = context.scene.cxr_data - _.layout.prop(settings, "debug") _.layout.prop(settings, "scale_factor") + _.layout.prop(settings, "skybox_scale_factor") + _.layout.prop(settings, "skyname" ) _.layout.prop(settings, "lightmap_scale") _.layout.prop(settings, "light_scale" ) _.layout.prop(settings, "image_quality" ) @@ -1784,7 +2162,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") @@ -1794,12 +2176,18 @@ class CXR_INTERFACE(bpy.types.Panel): row.prop(settings,"comp_textures") row.prop(settings,"comp_models") row.prop(settings,"comp_compile") + row.prop(settings,"comp_pack") text = "Compile" if CXR_COMPILER_CHAIN.TIMER == None else "Cancel" row = box.row() row.scale_y = 3 row.operator("convexer.chain", text=text) + row = box.row() + row.scale_y = 2 + row.operator("convexer.reset") + if CXR_COMPILER_CHAIN.TIMER != None: + row.enabled = False class CXR_MATERIAL_PANEL(bpy.types.Panel): bl_label="VMT Properties" @@ -1819,10 +2207,11 @@ class CXR_MATERIAL_PANEL(bpy.types.Panel): info = material_info( active_material ) _.layout.label(text=F"{info['name']} @{info['res'][0]}x{info['res'][1]}") - _.layout.prop( properties, "shader" ) + row = _.layout.row() + row.prop( properties, "shader" ) + row.operator( "convexer.matcomp" ) - for xk in info: - _.layout.label(text=F"{xk}:={info[xk]}") + #for xk in info: _.layout.label(text=F"{xk}:={info[xk]}") def _mtex( name, img, uiParent ): nonlocal properties @@ -1916,7 +2305,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] @@ -1954,6 +2343,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: @@ -2002,6 +2394,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 # ------------------------------------------------------------------------------ @@ -2071,14 +2483,29 @@ 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" ) - subdir: bpy.props.StringProperty( name="Subdirectory" ) + subdir: bpy.props.StringProperty( name="../csgo/ folder" ) exe_studiomdl: bpy.props.StringProperty( name="studiomdl" ) exe_vbsp: bpy.props.StringProperty( name="vbsp" ) @@ -2086,14 +2513,14 @@ class CXR_SCENE_SETTINGS(bpy.types.PropertyGroup): exe_vvis: bpy.props.StringProperty( name="vvis" ) opt_vvis: bpy.props.StringProperty( name="args" ) exe_vrad: bpy.props.StringProperty( name="vrad" ) - opt_vrad: bpy.props.StringProperty( name="args" ) + opt_vrad: bpy.props.StringProperty( name="args", \ + default="-reflectivityScale 0.35 -aoscale 1.4 -final -textureshadows -hdr -StaticPropLighting -StaticPropPolys" ) - debug: bpy.props.BoolProperty(name="Debug",default=False) scale_factor: bpy.props.FloatProperty( name="VMF Scale factor", \ default=32.0,min=1.0) skybox_scale_factor: bpy.props.FloatProperty( name="Sky Scale factor", \ default=1.0,min=0.01) - + skyname: bpy.props.StringProperty(name="Skyname",default="sky_csgo_night02b") skybox_offset: bpy.props.FloatProperty(name="Sky offset",default=-4096.0) light_scale: bpy.props.FloatProperty(name="Light Scale",default=1.0/5.0) include_names: bpy.props.BoolProperty(name="Append original file names",\ @@ -2107,13 +2534,15 @@ class CXR_SCENE_SETTINGS(bpy.types.PropertyGroup): comp_models: bpy.props.BoolProperty(name="Models",default=True) comp_textures: bpy.props.BoolProperty(name="Textures",default=True) comp_compile: bpy.props.BoolProperty(name="Compile",default=True) + comp_pack: bpy.props.BoolProperty(name="Pack",default=False) classes = [ CXR_RELOAD, CXR_DEV_OPERATOR, CXR_INTERFACE, \ CXR_MATERIAL_PANEL, CXR_IMAGE_SETTINGS,\ CXR_MODEL_SETTINGS, CXR_ENTITY_SETTINGS, CXR_CUBEMAP_SETTINGS,\ 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_VIEW3D, CXR_COMPILER_CHAIN, CXR_RESET_HASHES,\ + CXR_COMPILE_MATERIAL, CXR_COLLECTION_PANEL, CXR_RESET ] vmt_param_dynamic_class = None