diff --git a/Assets/vr.png b/Assets/vr.png deleted file mode 100644 index eb9d80f5..00000000 Binary files a/Assets/vr.png and /dev/null differ diff --git a/blender/arm/exporter_gp.py b/blender/arm/exporter_gp.py deleted file mode 100644 index 3ee80534..00000000 --- a/blender/arm/exporter_gp.py +++ /dev/null @@ -1,141 +0,0 @@ -import os - -from .arm import assets -from .arm.utils import build_dir, write_arm - -def export_grease_pencils(self): - gpRef = self.scene.grease_pencil - if gpRef == None or self.scene.arm_gp_export == False: - return - - # ArmoryExporter.option_mesh_per_file # Currently always exports to separate file - fp = self.get_greasepencils_file_path('greasepencil_' + gpRef.name, compressed=self.is_compress(gpRef)) - assets.add(fp) - ext = '' - if self.is_compress(gpRef): - ext = '.zip' - self.output['grease_pencil_ref'] = 'greasepencil_' + gpRef.name + ext + '/' + gpRef.name - - grease_pencil_dir = build_dir() + '/compiled/Shaders/grease_pencil/' - assets.add_shader_data(grease_pencil_dir + 'grease_pencil.arm') - assets.add_shader(grease_pencil_dir + 'grease_pencil.frag.glsl') - assets.add_shader(grease_pencil_dir + 'grease_pencil.vert.glsl') - assets.add_shader(grease_pencil_dir + 'grease_pencil_shadows.frag.glsl') - assets.add_shader(grease_pencil_dir + 'grease_pencil_shadows.vert.glsl') - - if gpRef.arm_cached == True and os.path.exists(fp): - return - - gpo = self.post_export_grease_pencil(gpRef) - gp_obj = {} - gp_obj['grease_pencil_datas'] = [gpo] - write_arm(fp, gp_obj) - gpRef.arm_cached = True - -def get_greasepencils_file_path(self, object_id, compressed=False): - index = self.filepath.rfind('/') - gp_fp = self.filepath[:(index + 1)] + 'greasepencils/' - if not os.path.exists(gp_fp): - os.makedirs(gp_fp) - ext = '.zip' if compressed else '.arm' - return gp_fp + object_id + ext - -def post_export_grease_pencil(self, gp): - o = {} - o['name'] = gp.name - o['layers'] = [] - for layer in gp.layers: - o['layers'].append(self.export_grease_pencil_layer(layer)) - # o['palettes'] = [] - # for palette in gp.palettes: - # o['palettes'].append(self.export_grease_pencil_palette(palette)) - o['shader'] = 'grease_pencil/grease_pencil' - return o - -def export_grease_pencil_layer(self, layer): - lo = {} - lo['name'] = layer.info - lo['opacity'] = layer.opacity - lo['frames'] = [] - for frame in layer.frames: - if frame.frame_number > 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))