From ad88b97d6353b944cb6567c9e92ae9145828af22 Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 6 Apr 2019 15:38:25 +0200 Subject: [PATCH] Code cleanup --- Assets/vr.png | Bin 3283 -> 0 bytes blender/arm/exporter_gp.py | 141 ------------------------------------- blender/arm/make.py | 2 - blender/arm/props.py | 4 -- blender/arm/props_ui.py | 1 - blender/arm/write_data.py | 5 -- 6 files changed, 153 deletions(-) delete mode 100644 Assets/vr.png delete mode 100644 blender/arm/exporter_gp.py diff --git a/Assets/vr.png b/Assets/vr.png deleted file mode 100644 index eb9d80f5c2c7a085951f2bcef00dc9a9bbf810f4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3283 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 self.scene.frame_end: - break - # TODO: load GP frame data - # self.scene.frame_set(frame.frame_number) - lo['frames'].append(self.export_grease_pencil_frame(frame)) - return lo - -def export_grease_pencil_frame(self, frame): - va = [] - cola = [] - colfilla = [] - indices = [] - num_stroke_points = [] - index_offset = 0 - for stroke in frame.strokes: - for point in stroke.points: - va.append(point.co[0]) - va.append(point.co[1]) - va.append(point.co[2]) - # TODO: store index to color pallete only, this is extremely wasteful - if stroke.color != None: - cola.append(stroke.color.color[0]) - cola.append(stroke.color.color[1]) - cola.append(stroke.color.color[2]) - cola.append(stroke.color.alpha) - colfilla.append(stroke.color.fill_color[0]) - colfilla.append(stroke.color.fill_color[1]) - colfilla.append(stroke.color.fill_color[2]) - colfilla.append(stroke.color.fill_alpha) - else: - cola.append(0.0) - cola.append(0.0) - cola.append(0.0) - cola.append(0.0) - colfilla.append(0.0) - colfilla.append(0.0) - colfilla.append(0.0) - colfilla.append(0.0) - for triangle in stroke.triangles: - indices.append(triangle.v1 + index_offset) - indices.append(triangle.v2 + index_offset) - indices.append(triangle.v3 + index_offset) - num_stroke_points.append(len(stroke.points)) - index_offset += len(stroke.points) - fo = {} - # TODO: merge into array of vertex arrays - fo['vertex_array'] = {} - fo['vertex_array']['attrib'] = 'pos' - fo['vertex_array']['data'] = 'short4norm' - fo['vertex_array']['values'] = va - fo['col_array'] = {} - fo['col_array']['attrib'] = 'col' - fo['col_array']['data'] = 'short4norm' - fo['col_array']['values'] = cola - fo['colfill_array'] = {} - fo['colfill_array']['attrib'] = 'colfill' - fo['colfill_array']['data'] = 'short4norm' - fo['colfill_array']['values'] = colfilla - fo['index_array'] = {} - fo['index_array']['material'] = 0 - fo['index_array']['values'] = indices - fo['num_stroke_points'] = num_stroke_points - fo['frame_number'] = frame.frame_number - return fo - -def export_grease_pencil_palette(self, palette): - po = {} - po['name'] = palette.info - po['colors'] = [] - for color in palette.colors: - po['colors'].append(self.export_grease_pencil_palette_color(color)) - return po - -def export_grease_pencil_palette_color(self, color): - co = {} - co['name'] = color.name - co['color'] = [color.color[0], color.color[1], color.color[2]] - co['alpha'] = color.alpha - co['fill_color'] = [color.fill_color[0], color.fill_color[1], color.fill_color[2]] - co['fill_alpha'] = color.fill_alpha - return co diff --git a/blender/arm/make.py b/blender/arm/make.py index a3661181..3c1a7806 100755 --- a/blender/arm/make.py +++ b/blender/arm/make.py @@ -135,8 +135,6 @@ def export_data(fp, sdk_path): modules.append('navigation') if export_ui: modules.append('ui') - if wrd.arm_hscript == 'Enabled': - modules.append('hscript') if wrd.arm_formatlib == 'Enabled': modules.append('format') print('Exported modules: ' + str(modules)) diff --git a/blender/arm/props.py b/blender/arm/props.py index f618d47c..3f55b9c8 100755 --- a/blender/arm/props.py +++ b/blender/arm/props.py @@ -47,10 +47,6 @@ def init_properties(): ('Enabled', 'Enabled', 'Enabled'), ('Auto', 'Auto', 'Auto')], name="Zui", default='Auto', description="Include UI library", update=assets.invalidate_compiler_cache) - bpy.types.World.arm_hscript = EnumProperty( - items=[('Disabled', 'Disabled', 'Disabled'), - ('Enabled', 'Enabled', 'Enabled')], - name="Hscript", default='Disabled', description="Include Hscript library", update=assets.invalidate_compiler_cache) bpy.types.World.arm_formatlib = EnumProperty( items=[('Disabled', 'Disabled', 'Disabled'), ('Enabled', 'Enabled', 'Enabled')], diff --git a/blender/arm/props_ui.py b/blender/arm/props_ui.py index ea6e9bda..54a38f77 100644 --- a/blender/arm/props_ui.py +++ b/blender/arm/props_ui.py @@ -418,7 +418,6 @@ class ARM_PT_ProjectModulesPanel(bpy.types.Panel): if wrd.arm_navigation != 'Disabled': layout.prop(wrd, 'arm_navigation_engine') layout.prop(wrd, 'arm_ui') - layout.prop(wrd, 'arm_hscript') layout.prop(wrd, 'arm_formatlib') layout.prop_search(wrd, 'arm_khafile', bpy.data, 'texts', text='Khafile') layout.prop(wrd, 'arm_project_root') diff --git a/blender/arm/write_data.py b/blender/arm/write_data.py index 6979f13c..716dda8e 100755 --- a/blender/arm/write_data.py +++ b/blender/arm/write_data.py @@ -229,11 +229,6 @@ project.addSources('Sources'); f.write(add_assets(p.replace('\\', '/'), use_data_dir=use_data_dir, rel_path=rel_path)) assets.add_khafile_def('arm_ui') - if wrd.arm_hscript == 'Enabled': - if not os.path.exists('Libraries/hscript'): - f.write(add_armory_library(sdk_path, 'lib/hscript', rel_path=rel_path)) - assets.add_khafile_def('arm_hscript') - if wrd.arm_formatlib == 'Enabled': if not os.path.exists('Libraries/iron_format'): f.write(add_armory_library(sdk_path, 'lib/iron_format', rel_path=rel_path))