From 0baf5fcaa90aadbacaa718a011f025ff5992061f Mon Sep 17 00:00:00 2001 From: luboslenco Date: Mon, 22 Jul 2024 00:14:37 +0200 Subject: [PATCH] Unify folder names --- .gitignore | 4 +-- armorforge/{Assets => assets}/Scene.arm | Bin armorforge/{Assets => assets}/badge.png | Bin .../{Assets => assets}/default_brush.arm | Bin .../{Assets => assets}/default_material.arm | Bin .../{Assets => assets}/licenses/license.md | 0 .../licenses/plugins/keepme.txt | 0 .../{Assets => assets}/meshes/keepme.txt | 0 .../{Assets => assets}/plugins/hello_world.js | 0 .../{Assets => assets}/readme/readme.txt | 0 .../readme/readme_android.txt | 0 .../{Assets => assets}/readme/readme_ios.txt | 0 armorforge/{Plugins => plugins}/project.js | 2 +- .../Sources => plugins/sources}/plugins.cpp | 0 armorforge/project.js | 32 +++++++++--------- armorforge/{Shaders => shaders}/keepme.txt | 0 armorforge/{Sources => sources}/manifest.ts | 0 .../{Sources => sources}/tab_objects.ts | 0 armorlab/{Assets => assets}/Scene.arm | Bin armorlab/{Assets => assets}/badge.png | Bin armorlab/{Assets => assets}/default_brush.arm | Bin .../export_presets/base_color.json | 0 .../export_presets/generic.json | 0 .../export_presets/minecraft_mer.json | 0 .../export_presets/unigine.json | 0 .../export_presets/unity.json | 0 .../export_presets/unreal.json | 0 .../export_presets/xplane.json | 0 .../keymap_presets/touch.json | 0 .../{Assets => assets}/licenses/license.md | 0 .../licenses/license_esrgan.md | 0 .../licenses/license_onnx.md | 0 .../licenses/license_photo_to_pbr.md | 0 .../{Assets => assets}/licenses/license_sd.md | 0 .../licenses/license_texsynth.md | 0 armorlab/{Assets => assets}/meshes/keepme.txt | 0 armorlab/{Assets => assets}/models/README.md | 0 armorlab/{Assets => assets}/placeholder.png | Bin .../plugins/dev/texture_breakdown.js | 0 .../plugins/hello_node_brush.js | 0 .../{Assets => assets}/plugins/hello_world.js | 0 .../{Assets => assets}/plugins/import_svg.js | 0 armorlab/{Assets => assets}/readme/readme.txt | 0 .../readme/readme_android.txt | 0 .../{Assets => assets}/readme/readme_dxr.txt | 0 .../{Assets => assets}/readme/readme_ios.txt | 0 .../{Assets => assets}/readme/readme_vkrt.txt | 0 armorlab/{Plugins => plugins}/project.js | 8 ++--- .../Sources => plugins/sources}/plugins.cpp | 0 .../sources}/proc_texsynth/LICENSE.md | 0 .../proc_texsynth/linux/libtexsynth.a | Bin .../proc_texsynth/macos/libtexsynth.a | Bin .../sources}/proc_texsynth/win32/texsynth.lib | Bin armorlab/project.js | 32 +++++++++--------- .../inpaint_preview.frag.glsl | 0 .../layer_copy_rrrr.frag.glsl | 0 .../{Sources => sources}/make_material.ts | 0 armorlab/{Sources => sources}/make_mesh.ts | 0 armorlab/{Sources => sources}/make_paint.ts | 0 armorlab/{Sources => sources}/manifest.ts | 0 .../nodes/brush_output_node.ts | 0 .../nodes/image_texture_node.ts | 0 .../nodes/inpaint_node.ts | 0 .../nodes/photo_to_pbr_node.ts | 0 .../{Sources => sources}/nodes/rgb_node.ts | 0 .../nodes/text_to_photo_node.ts | 0 .../{Sources => sources}/nodes/tiling_node.ts | 0 .../nodes/upscale_node.ts | 0 .../nodes/variance_node.ts | 0 armorlab/{Sources => sources}/nodes_brush.ts | 0 .../{Sources => sources}/render_path_paint.ts | 0 armorlab/{Sources => sources}/ui_nodes_ext.ts | 0 armorpaint/{Assets => assets}/Scene.arm | Bin armorpaint/{Assets => assets}/badge.png | Bin .../{Assets => assets}/default_brush.arm | Bin .../{Assets => assets}/default_material.arm | Bin .../export_presets/base_color.json | 0 .../export_presets/generic.json | 0 .../export_presets/minecraft_mer.json | 0 .../export_presets/unigine.json | 0 .../export_presets/unity.json | 0 .../export_presets/unreal.json | 0 .../export_presets/xplane.json | 0 .../keymap_presets/blender.json | 0 .../keymap_presets/touch.json | 0 .../{Assets => assets}/licenses/license.md | 0 .../licenses/license_cycles_nodes.md | 0 .../licenses/plugins/license_cgltf.md | 0 .../licenses/plugins/license_nanosvg.md | 0 .../licenses/plugins/license_tinyusdz.md | 0 .../licenses/plugins/license_utif.md | 0 .../licenses/plugins/license_xatlas.md | 0 .../meshes/cube_shared_uvs.arm | Bin .../{Assets => assets}/plugins/ammo/ammo.js | 0 .../plugins/dev/converter.js | 0 .../{Assets => assets}/plugins/hello_node.js | 0 .../plugins/hello_node_brush.js | 0 .../{Assets => assets}/plugins/hello_world.js | 0 .../{Assets => assets}/plugins/import_fbx.js | 0 .../plugins/import_gltf_glb.js | 0 .../{Assets => assets}/plugins/import_stl.js | 0 .../{Assets => assets}/plugins/import_svg.js | 0 .../{Assets => assets}/plugins/import_usdc.js | 0 .../plugins/texture_breakdown.js | 0 .../{Assets => assets}/plugins/uv_unwrap.js | 0 .../plugins/viewport_celshade.js | 0 .../{Assets => assets}/readme/readme.txt | 0 .../readme/readme_android.txt | 0 .../{Assets => assets}/readme/readme_dxr.txt | 0 .../{Assets => assets}/readme/readme_ios.txt | 0 .../{Assets => assets}/readme/readme_vkrt.txt | 0 .../{Assets => assets}/readme/readme_vr.txt | 0 armorpaint/{Plugins => plugins}/project.js | 2 +- .../sources}/io_dds/LICENSE.md | 0 .../sources}/io_dds/tinyddsloader.cpp | 0 .../sources}/io_dds/tinyddsloader.h | 0 .../sources}/io_fbx/io_fbx.c | 0 .../sources}/io_fbx/ufbx/LICENSE | 0 .../sources}/io_fbx/ufbx/ufbx.c | 0 .../sources}/io_fbx/ufbx/ufbx.h | 0 .../sources}/io_gltf/LICENSE.md | 0 .../sources}/io_gltf/cgltf.c | 0 .../sources}/io_gltf/cgltf.h | 0 .../sources}/io_svg/LICENSE.md | 0 .../sources}/io_svg/nanosvg.c | 0 .../sources}/io_svg/nanosvg.h | 0 .../sources}/io_svg/nanosvgrast.h | 0 .../sources}/io_usd/io_usd.cc | 0 .../sources}/io_usd/tinyusdz/LICENSE | 0 .../io_usd/tinyusdz/external/stb_image.h | 0 .../io_usd/tinyusdz/integerCoding.cpp | 0 .../sources}/io_usd/tinyusdz/integerCoding.h | 0 .../io_usd/tinyusdz/lz4-compression.cc | 0 .../io_usd/tinyusdz/lz4-compression.hh | 0 .../sources}/io_usd/tinyusdz/pxrLZ4/lz4.cpp | 0 .../sources}/io_usd/tinyusdz/pxrLZ4/lz4.h | 0 .../sources}/io_usd/tinyusdz/stream-reader.hh | 0 .../sources}/io_usd/tinyusdz/tinyusdz.cc | 0 .../sources}/io_usd/tinyusdz/tinyusdz.hh | 0 .../Sources => plugins/sources}/plugins.cpp | 0 .../sources}/proc_xatlas/LICENSE.md | 0 .../sources}/proc_xatlas/xatlas.cpp | 0 .../sources}/proc_xatlas/xatlas.h | 0 armorpaint/project.js | 30 ++++++++-------- .../{Shaders => shaders}/dilate_map.frag.glsl | 0 .../{Shaders => shaders}/dilate_map.vert.glsl | 0 .../dilate_pass.frag.glsl | 0 .../layer_invert.frag.glsl | 0 .../layer_merge.frag.glsl | 0 .../{Shaders => shaders}/layer_view.frag.glsl | 0 .../mask_colorid.frag.glsl | 0 .../{Shaders => shaders}/mask_merge.frag.glsl | 0 .../shaders}/mesh_posnor.frag.glsl | 2 +- .../mesh_posnor.vert.glsl | 0 .../{Sources => sources}/import_folder.ts | 0 armorpaint/{Sources => sources}/make_bake.ts | 0 armorpaint/{Sources => sources}/make_blur.ts | 0 armorpaint/{Sources => sources}/make_brush.ts | 0 armorpaint/{Sources => sources}/make_clone.ts | 0 .../make_colorid_picker.ts | 0 .../{Sources => sources}/make_discard.ts | 0 .../{Sources => sources}/make_material.ts | 0 armorpaint/{Sources => sources}/make_mesh.ts | 0 .../{Sources => sources}/make_mesh_preview.ts | 0 .../{Sources => sources}/make_node_preview.ts | 0 armorpaint/{Sources => sources}/make_paint.ts | 0 .../{Sources => sources}/make_particle.ts | 0 .../{Sources => sources}/make_texcoord.ts | 0 armorpaint/{Sources => sources}/manifest.ts | 0 .../nodes/brush_output_node.ts | 0 .../{Sources => sources}/nodes/input_node.ts | 0 .../nodes/tex_image_node.ts | 0 .../{Sources => sources}/nodes_brush.ts | 0 .../{Sources => sources}/render_path_paint.ts | 0 .../render_path_preview.ts | 0 armorpaint/{Sources => sources}/slot_brush.ts | 0 armorpaint/{Sources => sources}/slot_font.ts | 0 armorpaint/{Sources => sources}/slot_layer.ts | 0 .../{Sources => sources}/slot_material.ts | 0 armorpaint/{Sources => sources}/tab_layers.ts | 0 armorsculpt/{Assets => assets}/Scene.arm | Bin armorsculpt/{Assets => assets}/badge.png | Bin .../{Assets => assets}/default_brush.arm | Bin .../{Assets => assets}/default_material.arm | Bin .../keymap_presets/touch.json | 0 .../{Assets => assets}/licenses/license.md | 0 .../licenses/plugins/keepme.txt | 0 .../{Assets => assets}/meshes/keepme.txt | 0 .../{Assets => assets}/plugins/hello_world.js | 0 .../{Assets => assets}/readme/readme.txt | 0 .../readme/readme_android.txt | 0 .../{Assets => assets}/readme/readme_ios.txt | 0 armorsculpt/{Plugins => plugins}/project.js | 2 +- .../Sources => plugins/sources}/plugins.cpp | 0 armorsculpt/project.js | 24 ++++++------- .../layer_invert.frag.glsl | 0 .../layer_merge.frag.glsl | 0 .../{Shaders => shaders}/layer_view.frag.glsl | 0 .../{Shaders => shaders}/mask_merge.frag.glsl | 0 .../shaders}/mesh_posnor.frag.glsl | 2 +- .../mesh_posnor.vert.glsl | 0 .../{Sources => sources}/export_obj.ts | 0 .../{Sources => sources}/import_mesh.ts | 12 +++---- .../{Sources => sources}/make_brush.ts | 0 .../{Sources => sources}/make_material.ts | 0 armorsculpt/{Sources => sources}/make_mesh.ts | 0 .../{Sources => sources}/make_mesh_preview.ts | 0 .../{Sources => sources}/make_sculpt.ts | 0 armorsculpt/{Sources => sources}/manifest.ts | 0 .../nodes/brush_output_node.ts | 0 .../{Sources => sources}/tab_layers.ts | 0 base/Shaders/voxel_hlsl/voxel_pos.frag.glsl | Bin 775 -> 0 bytes base/Shaders/voxel_hlsl/voxel_pos.vert.glsl | Bin 838 -> 0 bytes base/{Assets => assets}/World_irradiance.arm | Bin base/{Assets => assets}/World_radiance.hdr | Bin base/{Assets => assets}/World_radiance_0.hdr | Bin base/{Assets => assets}/World_radiance_1.hdr | Bin base/{Assets => assets}/World_radiance_2.hdr | Bin base/{Assets => assets}/World_radiance_3.hdr | Bin base/{Assets => assets}/World_radiance_4.hdr | Bin base/{Assets => assets}/World_radiance_5.hdr | Bin base/{Assets => assets}/World_radiance_6.hdr | 0 base/{Assets => assets}/World_radiance_7.hdr | 0 base/{Assets => assets}/World_radiance_8.hdr | 0 base/{Assets => assets}/brdf.png | Bin base/{Assets => assets}/color_wheel.png | Bin .../color_wheel_gradient.png | Bin base/{Assets => assets}/cursor.png | Bin base/{Assets => assets}/extra/font_cjk.ttc | Bin base/{Assets => assets}/font.ttf | Bin base/{Assets => assets}/font_mono.ttf | Bin base/{Assets => assets}/icons.png | Bin base/{Assets => assets}/icons2x.png | Bin .../licenses/license_fonts.md | 0 .../licenses/license_icons.md | 0 .../licenses/license_kinc.md | 0 .../licenses/license_lz4-wasm.md | 0 .../licenses/license_nfd.md | 0 .../licenses/license_stb.md | 0 .../licenses/license_tinydir.md | 0 .../licenses/license_zlib.md | 0 base/{Assets => assets}/locale/de.json | 0 base/{Assets => assets}/locale/el.json | 0 base/{Assets => assets}/locale/es.json | 0 base/{Assets => assets}/locale/fr.json | 0 base/{Assets => assets}/locale/ja.json | 0 base/{Assets => assets}/locale/pl.json | 0 base/{Assets => assets}/locale/pt_br.json | 0 base/{Assets => assets}/locale/ru.json | 0 base/{Assets => assets}/locale/zh_cn.json | 0 base/{Assets => assets}/ltc_mag.arm | Bin base/{Assets => assets}/ltc_mat.arm | Bin base/{Assets => assets}/noise256.png | Bin base/{Assets => assets}/plugins/autosave.js | 0 .../{Assets => assets}/plugins/import_tiff.js | 0 base/{Assets => assets}/plugins/import_txt.js | 0 base/{Assets => assets}/raw/gizmo.blend | Bin base/{Assets => assets}/raw/icon/armory.svg | 0 .../{Assets => assets}/raw/icon/armory_svg.md | 0 base/{Assets => assets}/raw/icon/icon.ico | Bin base/{Assets => assets}/raw/icon/icon.png | Bin .../raw/icon/icon_macos.png | Bin base/{Assets => assets}/raw/icon/icon_raw.png | Bin base/{Assets => assets}/raw/icon_settings.png | Bin base/{Assets => assets}/raw/tool_bake.png | Bin base/{Assets => assets}/raw/tool_blur.png | Bin base/{Assets => assets}/raw/tool_brush.png | Bin base/{Assets => assets}/raw/tool_clone.png | Bin base/{Assets => assets}/raw/tool_colorid.png | Bin base/{Assets => assets}/raw/tool_decal.png | Bin base/{Assets => assets}/raw/tool_eraser.png | Bin base/{Assets => assets}/raw/tool_fill.png | Bin base/{Assets => assets}/raw/tool_particle.png | Bin base/{Assets => assets}/raw/tool_picker.png | Bin base/{Assets => assets}/raw/tool_text.png | Bin .../raytrace/bnoise_rank.png | Bin .../raytrace/bnoise_scramble.png | Bin .../raytrace/bnoise_sobol.png | Bin base/{Assets => assets}/shader_datas.arm | Bin base/{Assets => assets}/smaa_area.png | Bin base/{Assets => assets}/smaa_search.png | Bin base/{Assets => assets}/text_coloring.json | 0 base/{Assets => assets}/themes/light.json | 0 base/project.js | 32 +++++++++--------- .../bloom_downsample_pass.frag.glsl | 0 .../bloom_upsample_pass.frag.glsl | 0 .../compositor_pass.frag.glsl | 0 .../copy_mrt3_pass.frag.glsl | 0 base/{Shaders => shaders}/cursor.frag.glsl | 0 base/{Shaders => shaders}/cursor.vert.glsl | 0 .../deferred_light.frag.glsl | 0 .../deferred_light_voxel.frag.glsl | 0 .../histogram_pass.frag.glsl | 0 .../{Shaders => shaders}/layer_copy.frag.glsl | 0 .../layer_copy_bgra.frag.glsl | 0 .../{Shaders => shaders}/layer_view.vert.glsl | 0 base/{Shaders => shaders}/line.frag.glsl | 0 base/{Shaders => shaders}/line.vert.glsl | 0 .../{Shaders => shaders}/mask_apply.frag.glsl | 0 .../mesh_poscol.frag.glsl | 0 .../mesh_poscol.vert.glsl | 0 .../mesh_posnortex.frag.glsl | 0 .../mesh_posnortex.vert.glsl | 0 base/{Shaders => shaders}/pass.vert.glsl | 0 base/{Shaders => shaders}/pass_copy.frag.glsl | 0 .../pass_viewray.vert.glsl | 0 .../pass_viewray2.vert.glsl | 0 .../prefilter_envmap.frag.glsl | 0 .../raytrace/raytrace_bake_ao.cso | Bin .../raytrace/raytrace_bake_ao.metal | 0 .../raytrace/raytrace_bake_ao.spirv | Bin .../raytrace/raytrace_bake_bent.cso | Bin .../raytrace/raytrace_bake_bent.metal | 0 .../raytrace/raytrace_bake_bent.spirv | Bin .../raytrace/raytrace_bake_light.cso | Bin .../raytrace/raytrace_bake_light.metal | 0 .../raytrace/raytrace_bake_light.spirv | Bin .../raytrace/raytrace_bake_thick.cso | Bin .../raytrace/raytrace_bake_thick.metal | 0 .../raytrace/raytrace_bake_thick.spirv | Bin .../raytrace/raytrace_brute_core.cso | Bin .../raytrace/raytrace_brute_core.metal | 0 .../raytrace/raytrace_brute_core.spirv | Bin .../raytrace/raytrace_brute_full.cso | Bin .../raytrace/raytrace_brute_full.metal | 0 .../raytrace/raytrace_brute_full.spirv | Bin .../raytrace/src/build.bat | 0 .../raytrace/src/build_dxr.bat | 0 .../raytrace/src/build_vkrt.bat | 0 .../raytrace/src/build_vkrt.sh | 0 base/{Shaders => shaders}/raytrace/src/dxc | Bin .../{Shaders => shaders}/raytrace/src/dxc.exe | Bin .../raytrace/src/dxcompiler.dll | Bin .../raytrace/src/dxil.dll | Bin .../raytrace/src/libdxcompiler.so | Bin .../raytrace/src/libdxil.so | Bin .../raytrace/src/raytrace_bake_ao.hlsl | 0 .../raytrace/src/raytrace_bake_bent.hlsl | 0 .../raytrace/src/raytrace_bake_light.hlsl | 0 .../raytrace/src/raytrace_bake_thick.hlsl | 0 .../raytrace/src/raytrace_brute.hlsl | 0 .../raytrace/src/std/attrib.hlsl | 0 .../raytrace/src/std/dof.hlsl | 0 .../raytrace/src/std/math.hlsl | 0 .../raytrace/src/std/rand.hlsl | 0 .../smaa_blend_weight.frag.glsl | 0 .../smaa_blend_weight.vert.glsl | 0 .../smaa_edge_detect.frag.glsl | 0 .../smaa_edge_detect.vert.glsl | 0 .../smaa_neighborhood_blend.frag.glsl | 0 .../smaa_neighborhood_blend.vert.glsl | 0 .../ssao_blur_pass.frag.glsl | 0 base/{Shaders => shaders}/ssao_pass.frag.glsl | 0 .../ssr_blur_pass.frag.glsl | 0 base/{Shaders => shaders}/ssr_pass.frag.glsl | 0 base/{Shaders => shaders}/std/brdf.glsl | 0 base/{Shaders => shaders}/std/conetrace.glsl | 0 .../std/deferred_light.glsl | 0 base/{Shaders => shaders}/std/gbuffer.glsl | 0 base/{Shaders => shaders}/std/light.glsl | 0 base/{Shaders => shaders}/std/ltc.glsl | 0 base/{Shaders => shaders}/std/math.glsl | 0 base/{Shaders => shaders}/std/shirr.glsl | 0 .../supersample_resolve.frag.glsl | 0 base/{Shaders => shaders}/taa_pass.frag.glsl | 0 .../voxel_glsl/voxel_pos.frag.glsl | 0 .../voxel_glsl/voxel_pos.geom.glsl | 0 .../voxel_glsl/voxel_pos.vert.glsl | 0 .../voxel_hlsl/src/build.bat | 0 .../voxel_hlsl/src/hlslbin.exe | Bin .../voxel_hlsl/src/voxel_pos.frag.hlsl | 0 .../voxel_hlsl/src/voxel_pos.geom.hlsl | 0 .../voxel_hlsl/src/voxel_pos.vert.hlsl | 0 base/shaders/voxel_hlsl/voxel_pos.frag.glsl | Bin 0 -> 919 bytes .../voxel_hlsl/voxel_pos.geom.glsl | Bin base/shaders/voxel_hlsl/voxel_pos.vert.glsl | Bin 0 -> 2138 bytes .../{Shaders => shaders}/world_pass.frag.glsl | 0 .../{Shaders => shaders}/world_pass.vert.glsl | 0 base/{Sources => sources}/args.ts | 0 base/{Sources => sources}/base.ts | 0 base/{Sources => sources}/box_export.ts | 0 base/{Sources => sources}/box_preferences.ts | 0 base/{Sources => sources}/box_projects.ts | 0 base/{Sources => sources}/camera.ts | 0 base/{Sources => sources}/config.ts | 0 base/{Sources => sources}/console.ts | 0 base/{Sources => sources}/context.ts | 0 base/{Sources => sources}/enums.ts | 0 base/{Sources => sources}/export_arm.ts | 0 base/{Sources => sources}/export_gpl.ts | 0 base/{Sources => sources}/export_mesh.ts | 0 base/{Sources => sources}/export_obj.ts | 0 base/{Sources => sources}/export_texture.ts | 0 base/{Sources => sources}/file.ts | 0 base/{Sources => sources}/geom.ts | 9 ++++- base/{Sources => sources}/gizmo.ts | 0 base/{Sources => sources}/history.ts | 0 base/{Sources => sources}/import_arm.ts | 0 base/{Sources => sources}/import_asset.ts | 0 .../import_blend_material.ts | 0 .../{Sources => sources}/import_blend_mesh.ts | 0 base/{Sources => sources}/import_envmap.ts | 0 base/{Sources => sources}/import_font.ts | 0 base/{Sources => sources}/import_gpl.ts | 0 base/{Sources => sources}/import_keymap.ts | 0 base/{Sources => sources}/import_mesh.ts | 14 +++----- base/{Sources => sources}/import_obj.ts | 24 ++----------- base/{Sources => sources}/import_plugin.ts | 0 base/{Sources => sources}/import_texture.ts | 0 base/{Sources => sources}/import_theme.ts | 0 base/{Sources => sources}/line_draw.ts | 0 base/{Sources => sources}/logic_node.ts | 0 base/{Sources => sources}/main.ts | 0 base/{Sources => sources}/make_voxel.ts | 0 base/{Sources => sources}/node_shader.ts | 24 ++++++++----- .../node_shader_context.ts | 0 .../nodes/boolean_node.ts | 0 base/{Sources => sources}/nodes/color_node.ts | 0 base/{Sources => sources}/nodes/float_node.ts | 0 .../nodes/integer_node.ts | 0 base/{Sources => sources}/nodes/math_node.ts | 0 base/{Sources => sources}/nodes/null_node.ts | 0 .../{Sources => sources}/nodes/random_node.ts | 0 .../nodes/separate_vector_node.ts | 0 .../{Sources => sources}/nodes/string_node.ts | 0 base/{Sources => sources}/nodes/time_node.ts | 0 .../nodes/vector_math_node.ts | 0 .../{Sources => sources}/nodes/vector_node.ts | 0 base/{Sources => sources}/nodes_material.ts | 0 base/{Sources => sources}/operator.ts | 0 base/{Sources => sources}/parser_blend.ts | 0 base/{Sources => sources}/parser_exr.ts | 0 base/{Sources => sources}/parser_logic.ts | 0 base/{Sources => sources}/parser_material.ts | 0 base/{Sources => sources}/path.ts | 3 +- base/{Sources => sources}/physics_body.ts | 0 base/{Sources => sources}/physics_bullet.ts | 0 base/{Sources => sources}/physics_world.ts | 0 base/{Sources => sources}/plugin.ts | 0 base/{Sources => sources}/project.ts | 0 base/{Sources => sources}/render_path_base.ts | 0 .../render_path_deferred.ts | 0 .../render_path_forward.ts | 0 .../render_path_raytrace.ts | 0 .../render_path_raytrace_bake.ts | 0 base/{Sources => sources}/resource.ts | 0 base/{Sources => sources}/strings.ts | 0 base/{Sources => sources}/tab_browser.ts | 0 base/{Sources => sources}/tab_brushes.ts | 0 base/{Sources => sources}/tab_console.ts | 0 base/{Sources => sources}/tab_fonts.ts | 0 base/{Sources => sources}/tab_history.ts | 0 base/{Sources => sources}/tab_materials.ts | 0 base/{Sources => sources}/tab_meshes.ts | 0 base/{Sources => sources}/tab_particles.ts | 0 base/{Sources => sources}/tab_plugins.ts | 0 base/{Sources => sources}/tab_script.ts | 0 base/{Sources => sources}/tab_swatches.ts | 0 base/{Sources => sources}/tab_textures.ts | 0 base/{Sources => sources}/translator.ts | 4 ++- base/{Sources => sources}/ui_base.ts | 0 base/{Sources => sources}/ui_box.ts | 0 base/{Sources => sources}/ui_files.ts | 0 base/{Sources => sources}/ui_header.ts | 0 base/{Sources => sources}/ui_menu.ts | 0 base/{Sources => sources}/ui_menubar.ts | 0 base/{Sources => sources}/ui_nodes.ts | 0 base/{Sources => sources}/ui_status.ts | 0 base/{Sources => sources}/ui_toolbar.ts | 0 base/{Sources => sources}/ui_view2d.ts | 0 base/{Sources => sources}/uniforms_ext.ts | 0 base/{Sources => sources}/util_mesh.ts | 15 ++++---- base/{Sources => sources}/util_particle.ts | 0 base/{Sources => sources}/util_render.ts | 0 base/{Sources => sources}/util_uv.ts | 0 base/{Sources => sources}/viewport.ts | 0 base/{Tools => tools}/extract_locales.js | 0 misc/pad/project.js | 6 ++-- misc/pad/{Sources => sources}/main.ts | 0 479 files changed, 139 insertions(+), 144 deletions(-) rename armorforge/{Assets => assets}/Scene.arm (100%) rename armorforge/{Assets => assets}/badge.png (100%) rename armorforge/{Assets => assets}/default_brush.arm (100%) rename armorforge/{Assets => assets}/default_material.arm (100%) rename armorforge/{Assets => assets}/licenses/license.md (100%) rename armorforge/{Assets => assets}/licenses/plugins/keepme.txt (100%) rename armorforge/{Assets => assets}/meshes/keepme.txt (100%) rename armorforge/{Assets => assets}/plugins/hello_world.js (100%) rename armorforge/{Assets => assets}/readme/readme.txt (100%) rename armorforge/{Assets => assets}/readme/readme_android.txt (100%) rename armorforge/{Assets => assets}/readme/readme_ios.txt (100%) rename armorforge/{Plugins => plugins}/project.js (75%) rename armorforge/{Plugins/Sources => plugins/sources}/plugins.cpp (100%) rename armorforge/{Shaders => shaders}/keepme.txt (100%) rename armorforge/{Sources => sources}/manifest.ts (100%) rename armorforge/{Sources => sources}/tab_objects.ts (100%) rename armorlab/{Assets => assets}/Scene.arm (100%) rename armorlab/{Assets => assets}/badge.png (100%) rename armorlab/{Assets => assets}/default_brush.arm (100%) rename armorlab/{Assets => assets}/export_presets/base_color.json (100%) rename armorlab/{Assets => assets}/export_presets/generic.json (100%) rename armorlab/{Assets => assets}/export_presets/minecraft_mer.json (100%) rename armorlab/{Assets => assets}/export_presets/unigine.json (100%) rename armorlab/{Assets => assets}/export_presets/unity.json (100%) rename armorlab/{Assets => assets}/export_presets/unreal.json (100%) rename armorlab/{Assets => assets}/export_presets/xplane.json (100%) rename armorlab/{Assets => assets}/keymap_presets/touch.json (100%) rename armorlab/{Assets => assets}/licenses/license.md (100%) rename armorlab/{Assets => assets}/licenses/license_esrgan.md (100%) rename armorlab/{Assets => assets}/licenses/license_onnx.md (100%) rename armorlab/{Assets => assets}/licenses/license_photo_to_pbr.md (100%) rename armorlab/{Assets => assets}/licenses/license_sd.md (100%) rename armorlab/{Assets => assets}/licenses/license_texsynth.md (100%) rename armorlab/{Assets => assets}/meshes/keepme.txt (100%) rename armorlab/{Assets => assets}/models/README.md (100%) rename armorlab/{Assets => assets}/placeholder.png (100%) rename armorlab/{Assets => assets}/plugins/dev/texture_breakdown.js (100%) rename armorlab/{Assets => assets}/plugins/hello_node_brush.js (100%) rename armorlab/{Assets => assets}/plugins/hello_world.js (100%) rename armorlab/{Assets => assets}/plugins/import_svg.js (100%) rename armorlab/{Assets => assets}/readme/readme.txt (100%) rename armorlab/{Assets => assets}/readme/readme_android.txt (100%) rename armorlab/{Assets => assets}/readme/readme_dxr.txt (100%) rename armorlab/{Assets => assets}/readme/readme_ios.txt (100%) rename armorlab/{Assets => assets}/readme/readme_vkrt.txt (100%) rename armorlab/{Plugins => plugins}/project.js (55%) rename armorlab/{Plugins/Sources => plugins/sources}/plugins.cpp (100%) rename armorlab/{Plugins/Sources => plugins/sources}/proc_texsynth/LICENSE.md (100%) rename armorlab/{Plugins/Sources => plugins/sources}/proc_texsynth/linux/libtexsynth.a (100%) rename armorlab/{Plugins/Sources => plugins/sources}/proc_texsynth/macos/libtexsynth.a (100%) rename armorlab/{Plugins/Sources => plugins/sources}/proc_texsynth/win32/texsynth.lib (100%) rename armorlab/{Shaders => shaders}/inpaint_preview.frag.glsl (100%) rename armorlab/{Shaders => shaders}/layer_copy_rrrr.frag.glsl (100%) rename armorlab/{Sources => sources}/make_material.ts (100%) rename armorlab/{Sources => sources}/make_mesh.ts (100%) rename armorlab/{Sources => sources}/make_paint.ts (100%) rename armorlab/{Sources => sources}/manifest.ts (100%) rename armorlab/{Sources => sources}/nodes/brush_output_node.ts (100%) rename armorlab/{Sources => sources}/nodes/image_texture_node.ts (100%) rename armorlab/{Sources => sources}/nodes/inpaint_node.ts (100%) rename armorlab/{Sources => sources}/nodes/photo_to_pbr_node.ts (100%) rename armorlab/{Sources => sources}/nodes/rgb_node.ts (100%) rename armorlab/{Sources => sources}/nodes/text_to_photo_node.ts (100%) rename armorlab/{Sources => sources}/nodes/tiling_node.ts (100%) rename armorlab/{Sources => sources}/nodes/upscale_node.ts (100%) rename armorlab/{Sources => sources}/nodes/variance_node.ts (100%) rename armorlab/{Sources => sources}/nodes_brush.ts (100%) rename armorlab/{Sources => sources}/render_path_paint.ts (100%) rename armorlab/{Sources => sources}/ui_nodes_ext.ts (100%) rename armorpaint/{Assets => assets}/Scene.arm (100%) rename armorpaint/{Assets => assets}/badge.png (100%) rename armorpaint/{Assets => assets}/default_brush.arm (100%) rename armorpaint/{Assets => assets}/default_material.arm (100%) rename armorpaint/{Assets => assets}/export_presets/base_color.json (100%) rename armorpaint/{Assets => assets}/export_presets/generic.json (100%) rename armorpaint/{Assets => assets}/export_presets/minecraft_mer.json (100%) rename armorpaint/{Assets => assets}/export_presets/unigine.json (100%) rename armorpaint/{Assets => assets}/export_presets/unity.json (100%) rename armorpaint/{Assets => assets}/export_presets/unreal.json (100%) rename armorpaint/{Assets => assets}/export_presets/xplane.json (100%) rename armorpaint/{Assets => assets}/keymap_presets/blender.json (100%) rename armorpaint/{Assets => assets}/keymap_presets/touch.json (100%) rename armorpaint/{Assets => assets}/licenses/license.md (100%) rename armorpaint/{Assets => assets}/licenses/license_cycles_nodes.md (100%) rename armorpaint/{Assets => assets}/licenses/plugins/license_cgltf.md (100%) rename armorpaint/{Assets => assets}/licenses/plugins/license_nanosvg.md (100%) rename armorpaint/{Assets => assets}/licenses/plugins/license_tinyusdz.md (100%) rename armorpaint/{Assets => assets}/licenses/plugins/license_utif.md (100%) rename armorpaint/{Assets => assets}/licenses/plugins/license_xatlas.md (100%) rename armorpaint/{Assets => assets}/meshes/cube_shared_uvs.arm (100%) rename armorpaint/{Assets => assets}/plugins/ammo/ammo.js (100%) rename armorpaint/{Assets => assets}/plugins/dev/converter.js (100%) rename armorpaint/{Assets => assets}/plugins/hello_node.js (100%) rename armorpaint/{Assets => assets}/plugins/hello_node_brush.js (100%) rename armorpaint/{Assets => assets}/plugins/hello_world.js (100%) rename armorpaint/{Assets => assets}/plugins/import_fbx.js (100%) rename armorpaint/{Assets => assets}/plugins/import_gltf_glb.js (100%) rename armorpaint/{Assets => assets}/plugins/import_stl.js (100%) rename armorpaint/{Assets => assets}/plugins/import_svg.js (100%) rename armorpaint/{Assets => assets}/plugins/import_usdc.js (100%) rename armorpaint/{Assets => assets}/plugins/texture_breakdown.js (100%) rename armorpaint/{Assets => assets}/plugins/uv_unwrap.js (100%) rename armorpaint/{Assets => assets}/plugins/viewport_celshade.js (100%) rename armorpaint/{Assets => assets}/readme/readme.txt (100%) rename armorpaint/{Assets => assets}/readme/readme_android.txt (100%) rename armorpaint/{Assets => assets}/readme/readme_dxr.txt (100%) rename armorpaint/{Assets => assets}/readme/readme_ios.txt (100%) rename armorpaint/{Assets => assets}/readme/readme_vkrt.txt (100%) rename armorpaint/{Assets => assets}/readme/readme_vr.txt (100%) rename armorpaint/{Plugins => plugins}/project.js (81%) rename armorpaint/{Plugins/Sources => plugins/sources}/io_dds/LICENSE.md (100%) rename armorpaint/{Plugins/Sources => plugins/sources}/io_dds/tinyddsloader.cpp (100%) rename armorpaint/{Plugins/Sources => plugins/sources}/io_dds/tinyddsloader.h (100%) rename armorpaint/{Plugins/Sources => plugins/sources}/io_fbx/io_fbx.c (100%) rename armorpaint/{Plugins/Sources => plugins/sources}/io_fbx/ufbx/LICENSE (100%) rename armorpaint/{Plugins/Sources => plugins/sources}/io_fbx/ufbx/ufbx.c (100%) rename armorpaint/{Plugins/Sources => plugins/sources}/io_fbx/ufbx/ufbx.h (100%) rename armorpaint/{Plugins/Sources => plugins/sources}/io_gltf/LICENSE.md (100%) rename armorpaint/{Plugins/Sources => plugins/sources}/io_gltf/cgltf.c (100%) rename armorpaint/{Plugins/Sources => plugins/sources}/io_gltf/cgltf.h (100%) rename armorpaint/{Plugins/Sources => plugins/sources}/io_svg/LICENSE.md (100%) rename armorpaint/{Plugins/Sources => plugins/sources}/io_svg/nanosvg.c (100%) rename armorpaint/{Plugins/Sources => plugins/sources}/io_svg/nanosvg.h (100%) rename armorpaint/{Plugins/Sources => plugins/sources}/io_svg/nanosvgrast.h (100%) rename armorpaint/{Plugins/Sources => plugins/sources}/io_usd/io_usd.cc (100%) rename armorpaint/{Plugins/Sources => plugins/sources}/io_usd/tinyusdz/LICENSE (100%) rename armorpaint/{Plugins/Sources => plugins/sources}/io_usd/tinyusdz/external/stb_image.h (100%) rename armorpaint/{Plugins/Sources => plugins/sources}/io_usd/tinyusdz/integerCoding.cpp (100%) rename armorpaint/{Plugins/Sources => plugins/sources}/io_usd/tinyusdz/integerCoding.h (100%) rename armorpaint/{Plugins/Sources => plugins/sources}/io_usd/tinyusdz/lz4-compression.cc (100%) rename armorpaint/{Plugins/Sources => plugins/sources}/io_usd/tinyusdz/lz4-compression.hh (100%) rename armorpaint/{Plugins/Sources => plugins/sources}/io_usd/tinyusdz/pxrLZ4/lz4.cpp (100%) rename armorpaint/{Plugins/Sources => plugins/sources}/io_usd/tinyusdz/pxrLZ4/lz4.h (100%) rename armorpaint/{Plugins/Sources => plugins/sources}/io_usd/tinyusdz/stream-reader.hh (100%) rename armorpaint/{Plugins/Sources => plugins/sources}/io_usd/tinyusdz/tinyusdz.cc (100%) rename armorpaint/{Plugins/Sources => plugins/sources}/io_usd/tinyusdz/tinyusdz.hh (100%) rename armorpaint/{Plugins/Sources => plugins/sources}/plugins.cpp (100%) rename armorpaint/{Plugins/Sources => plugins/sources}/proc_xatlas/LICENSE.md (100%) rename armorpaint/{Plugins/Sources => plugins/sources}/proc_xatlas/xatlas.cpp (100%) rename armorpaint/{Plugins/Sources => plugins/sources}/proc_xatlas/xatlas.h (100%) rename armorpaint/{Shaders => shaders}/dilate_map.frag.glsl (100%) rename armorpaint/{Shaders => shaders}/dilate_map.vert.glsl (100%) rename armorpaint/{Shaders => shaders}/dilate_pass.frag.glsl (100%) rename armorpaint/{Shaders => shaders}/layer_invert.frag.glsl (100%) rename armorpaint/{Shaders => shaders}/layer_merge.frag.glsl (100%) rename armorpaint/{Shaders => shaders}/layer_view.frag.glsl (100%) rename armorpaint/{Shaders => shaders}/mask_colorid.frag.glsl (100%) rename armorpaint/{Shaders => shaders}/mask_merge.frag.glsl (100%) rename {armorsculpt/Shaders => armorpaint/shaders}/mesh_posnor.frag.glsl (93%) rename armorpaint/{Shaders => shaders}/mesh_posnor.vert.glsl (100%) rename armorpaint/{Sources => sources}/import_folder.ts (100%) rename armorpaint/{Sources => sources}/make_bake.ts (100%) rename armorpaint/{Sources => sources}/make_blur.ts (100%) rename armorpaint/{Sources => sources}/make_brush.ts (100%) rename armorpaint/{Sources => sources}/make_clone.ts (100%) rename armorpaint/{Sources => sources}/make_colorid_picker.ts (100%) rename armorpaint/{Sources => sources}/make_discard.ts (100%) rename armorpaint/{Sources => sources}/make_material.ts (100%) rename armorpaint/{Sources => sources}/make_mesh.ts (100%) rename armorpaint/{Sources => sources}/make_mesh_preview.ts (100%) rename armorpaint/{Sources => sources}/make_node_preview.ts (100%) rename armorpaint/{Sources => sources}/make_paint.ts (100%) rename armorpaint/{Sources => sources}/make_particle.ts (100%) rename armorpaint/{Sources => sources}/make_texcoord.ts (100%) rename armorpaint/{Sources => sources}/manifest.ts (100%) rename armorpaint/{Sources => sources}/nodes/brush_output_node.ts (100%) rename armorpaint/{Sources => sources}/nodes/input_node.ts (100%) rename armorpaint/{Sources => sources}/nodes/tex_image_node.ts (100%) rename armorpaint/{Sources => sources}/nodes_brush.ts (100%) rename armorpaint/{Sources => sources}/render_path_paint.ts (100%) rename armorpaint/{Sources => sources}/render_path_preview.ts (100%) rename armorpaint/{Sources => sources}/slot_brush.ts (100%) rename armorpaint/{Sources => sources}/slot_font.ts (100%) rename armorpaint/{Sources => sources}/slot_layer.ts (100%) rename armorpaint/{Sources => sources}/slot_material.ts (100%) rename armorpaint/{Sources => sources}/tab_layers.ts (100%) rename armorsculpt/{Assets => assets}/Scene.arm (100%) rename armorsculpt/{Assets => assets}/badge.png (100%) rename armorsculpt/{Assets => assets}/default_brush.arm (100%) rename armorsculpt/{Assets => assets}/default_material.arm (100%) rename armorsculpt/{Assets => assets}/keymap_presets/touch.json (100%) rename armorsculpt/{Assets => assets}/licenses/license.md (100%) rename armorsculpt/{Assets => assets}/licenses/plugins/keepme.txt (100%) rename armorsculpt/{Assets => assets}/meshes/keepme.txt (100%) rename armorsculpt/{Assets => assets}/plugins/hello_world.js (100%) rename armorsculpt/{Assets => assets}/readme/readme.txt (100%) rename armorsculpt/{Assets => assets}/readme/readme_android.txt (100%) rename armorsculpt/{Assets => assets}/readme/readme_ios.txt (100%) rename armorsculpt/{Plugins => plugins}/project.js (75%) rename armorsculpt/{Plugins/Sources => plugins/sources}/plugins.cpp (100%) rename armorsculpt/{Shaders => shaders}/layer_invert.frag.glsl (100%) rename armorsculpt/{Shaders => shaders}/layer_merge.frag.glsl (100%) rename armorsculpt/{Shaders => shaders}/layer_view.frag.glsl (100%) rename armorsculpt/{Shaders => shaders}/mask_merge.frag.glsl (100%) rename {armorpaint/Shaders => armorsculpt/shaders}/mesh_posnor.frag.glsl (93%) rename armorsculpt/{Shaders => shaders}/mesh_posnor.vert.glsl (100%) rename armorsculpt/{Sources => sources}/export_obj.ts (100%) rename armorsculpt/{Sources => sources}/import_mesh.ts (96%) rename armorsculpt/{Sources => sources}/make_brush.ts (100%) rename armorsculpt/{Sources => sources}/make_material.ts (100%) rename armorsculpt/{Sources => sources}/make_mesh.ts (100%) rename armorsculpt/{Sources => sources}/make_mesh_preview.ts (100%) rename armorsculpt/{Sources => sources}/make_sculpt.ts (100%) rename armorsculpt/{Sources => sources}/manifest.ts (100%) rename armorsculpt/{Sources => sources}/nodes/brush_output_node.ts (100%) rename armorsculpt/{Sources => sources}/tab_layers.ts (100%) delete mode 100644 base/Shaders/voxel_hlsl/voxel_pos.frag.glsl delete mode 100644 base/Shaders/voxel_hlsl/voxel_pos.vert.glsl rename base/{Assets => assets}/World_irradiance.arm (100%) rename base/{Assets => assets}/World_radiance.hdr (100%) rename base/{Assets => assets}/World_radiance_0.hdr (100%) rename base/{Assets => assets}/World_radiance_1.hdr (100%) rename base/{Assets => assets}/World_radiance_2.hdr (100%) rename base/{Assets => assets}/World_radiance_3.hdr (100%) rename base/{Assets => assets}/World_radiance_4.hdr (100%) rename base/{Assets => assets}/World_radiance_5.hdr (100%) rename base/{Assets => assets}/World_radiance_6.hdr (100%) rename base/{Assets => assets}/World_radiance_7.hdr (100%) rename base/{Assets => assets}/World_radiance_8.hdr (100%) rename base/{Assets => assets}/brdf.png (100%) rename base/{Assets => assets}/color_wheel.png (100%) rename base/{Assets => assets}/color_wheel_gradient.png (100%) rename base/{Assets => assets}/cursor.png (100%) rename base/{Assets => assets}/extra/font_cjk.ttc (100%) rename base/{Assets => assets}/font.ttf (100%) rename base/{Assets => assets}/font_mono.ttf (100%) rename base/{Assets => assets}/icons.png (100%) rename base/{Assets => assets}/icons2x.png (100%) rename base/{Assets => assets}/licenses/license_fonts.md (100%) rename base/{Assets => assets}/licenses/license_icons.md (100%) rename base/{Assets => assets}/licenses/license_kinc.md (100%) rename base/{Assets => assets}/licenses/license_lz4-wasm.md (100%) rename base/{Assets => assets}/licenses/license_nfd.md (100%) rename base/{Assets => assets}/licenses/license_stb.md (100%) rename base/{Assets => assets}/licenses/license_tinydir.md (100%) rename base/{Assets => assets}/licenses/license_zlib.md (100%) rename base/{Assets => assets}/locale/de.json (100%) rename base/{Assets => assets}/locale/el.json (100%) rename base/{Assets => assets}/locale/es.json (100%) rename base/{Assets => assets}/locale/fr.json (100%) rename base/{Assets => assets}/locale/ja.json (100%) rename base/{Assets => assets}/locale/pl.json (100%) rename base/{Assets => assets}/locale/pt_br.json (100%) rename base/{Assets => assets}/locale/ru.json (100%) rename base/{Assets => assets}/locale/zh_cn.json (100%) rename base/{Assets => assets}/ltc_mag.arm (100%) rename base/{Assets => assets}/ltc_mat.arm (100%) rename base/{Assets => assets}/noise256.png (100%) rename base/{Assets => assets}/plugins/autosave.js (100%) rename base/{Assets => assets}/plugins/import_tiff.js (100%) rename base/{Assets => assets}/plugins/import_txt.js (100%) rename base/{Assets => assets}/raw/gizmo.blend (100%) rename base/{Assets => assets}/raw/icon/armory.svg (100%) rename base/{Assets => assets}/raw/icon/armory_svg.md (100%) rename base/{Assets => assets}/raw/icon/icon.ico (100%) rename base/{Assets => assets}/raw/icon/icon.png (100%) rename base/{Assets => assets}/raw/icon/icon_macos.png (100%) rename base/{Assets => assets}/raw/icon/icon_raw.png (100%) rename base/{Assets => assets}/raw/icon_settings.png (100%) rename base/{Assets => assets}/raw/tool_bake.png (100%) rename base/{Assets => assets}/raw/tool_blur.png (100%) rename base/{Assets => assets}/raw/tool_brush.png (100%) rename base/{Assets => assets}/raw/tool_clone.png (100%) rename base/{Assets => assets}/raw/tool_colorid.png (100%) rename base/{Assets => assets}/raw/tool_decal.png (100%) rename base/{Assets => assets}/raw/tool_eraser.png (100%) rename base/{Assets => assets}/raw/tool_fill.png (100%) rename base/{Assets => assets}/raw/tool_particle.png (100%) rename base/{Assets => assets}/raw/tool_picker.png (100%) rename base/{Assets => assets}/raw/tool_text.png (100%) rename base/{Assets => assets}/raytrace/bnoise_rank.png (100%) rename base/{Assets => assets}/raytrace/bnoise_scramble.png (100%) rename base/{Assets => assets}/raytrace/bnoise_sobol.png (100%) rename base/{Assets => assets}/shader_datas.arm (100%) rename base/{Assets => assets}/smaa_area.png (100%) rename base/{Assets => assets}/smaa_search.png (100%) rename base/{Assets => assets}/text_coloring.json (100%) rename base/{Assets => assets}/themes/light.json (100%) rename base/{Shaders => shaders}/bloom_downsample_pass.frag.glsl (100%) rename base/{Shaders => shaders}/bloom_upsample_pass.frag.glsl (100%) rename base/{Shaders => shaders}/compositor_pass.frag.glsl (100%) rename base/{Shaders => shaders}/copy_mrt3_pass.frag.glsl (100%) rename base/{Shaders => shaders}/cursor.frag.glsl (100%) rename base/{Shaders => shaders}/cursor.vert.glsl (100%) rename base/{Shaders => shaders}/deferred_light.frag.glsl (100%) rename base/{Shaders => shaders}/deferred_light_voxel.frag.glsl (100%) rename base/{Shaders => shaders}/histogram_pass.frag.glsl (100%) rename base/{Shaders => shaders}/layer_copy.frag.glsl (100%) rename base/{Shaders => shaders}/layer_copy_bgra.frag.glsl (100%) rename base/{Shaders => shaders}/layer_view.vert.glsl (100%) rename base/{Shaders => shaders}/line.frag.glsl (100%) rename base/{Shaders => shaders}/line.vert.glsl (100%) rename base/{Shaders => shaders}/mask_apply.frag.glsl (100%) rename base/{Shaders => shaders}/mesh_poscol.frag.glsl (100%) rename base/{Shaders => shaders}/mesh_poscol.vert.glsl (100%) rename base/{Shaders => shaders}/mesh_posnortex.frag.glsl (100%) rename base/{Shaders => shaders}/mesh_posnortex.vert.glsl (100%) rename base/{Shaders => shaders}/pass.vert.glsl (100%) rename base/{Shaders => shaders}/pass_copy.frag.glsl (100%) rename base/{Shaders => shaders}/pass_viewray.vert.glsl (100%) rename base/{Shaders => shaders}/pass_viewray2.vert.glsl (100%) rename base/{Shaders => shaders}/prefilter_envmap.frag.glsl (100%) rename base/{Shaders => shaders}/raytrace/raytrace_bake_ao.cso (100%) rename base/{Shaders => shaders}/raytrace/raytrace_bake_ao.metal (100%) rename base/{Shaders => shaders}/raytrace/raytrace_bake_ao.spirv (100%) rename base/{Shaders => shaders}/raytrace/raytrace_bake_bent.cso (100%) rename base/{Shaders => shaders}/raytrace/raytrace_bake_bent.metal (100%) rename base/{Shaders => shaders}/raytrace/raytrace_bake_bent.spirv (100%) rename base/{Shaders => shaders}/raytrace/raytrace_bake_light.cso (100%) rename base/{Shaders => shaders}/raytrace/raytrace_bake_light.metal (100%) rename base/{Shaders => shaders}/raytrace/raytrace_bake_light.spirv (100%) rename base/{Shaders => shaders}/raytrace/raytrace_bake_thick.cso (100%) rename base/{Shaders => shaders}/raytrace/raytrace_bake_thick.metal (100%) rename base/{Shaders => shaders}/raytrace/raytrace_bake_thick.spirv (100%) rename base/{Shaders => shaders}/raytrace/raytrace_brute_core.cso (100%) rename base/{Shaders => shaders}/raytrace/raytrace_brute_core.metal (100%) rename base/{Shaders => shaders}/raytrace/raytrace_brute_core.spirv (100%) rename base/{Shaders => shaders}/raytrace/raytrace_brute_full.cso (100%) rename base/{Shaders => shaders}/raytrace/raytrace_brute_full.metal (100%) rename base/{Shaders => shaders}/raytrace/raytrace_brute_full.spirv (100%) rename base/{Shaders => shaders}/raytrace/src/build.bat (100%) rename base/{Shaders => shaders}/raytrace/src/build_dxr.bat (100%) rename base/{Shaders => shaders}/raytrace/src/build_vkrt.bat (100%) rename base/{Shaders => shaders}/raytrace/src/build_vkrt.sh (100%) rename base/{Shaders => shaders}/raytrace/src/dxc (100%) rename base/{Shaders => shaders}/raytrace/src/dxc.exe (100%) rename base/{Shaders => shaders}/raytrace/src/dxcompiler.dll (100%) rename base/{Shaders => shaders}/raytrace/src/dxil.dll (100%) rename base/{Shaders => shaders}/raytrace/src/libdxcompiler.so (100%) rename base/{Shaders => shaders}/raytrace/src/libdxil.so (100%) rename base/{Shaders => shaders}/raytrace/src/raytrace_bake_ao.hlsl (100%) rename base/{Shaders => shaders}/raytrace/src/raytrace_bake_bent.hlsl (100%) rename base/{Shaders => shaders}/raytrace/src/raytrace_bake_light.hlsl (100%) rename base/{Shaders => shaders}/raytrace/src/raytrace_bake_thick.hlsl (100%) rename base/{Shaders => shaders}/raytrace/src/raytrace_brute.hlsl (100%) rename base/{Shaders => shaders}/raytrace/src/std/attrib.hlsl (100%) rename base/{Shaders => shaders}/raytrace/src/std/dof.hlsl (100%) rename base/{Shaders => shaders}/raytrace/src/std/math.hlsl (100%) rename base/{Shaders => shaders}/raytrace/src/std/rand.hlsl (100%) rename base/{Shaders => shaders}/smaa_blend_weight.frag.glsl (100%) rename base/{Shaders => shaders}/smaa_blend_weight.vert.glsl (100%) rename base/{Shaders => shaders}/smaa_edge_detect.frag.glsl (100%) rename base/{Shaders => shaders}/smaa_edge_detect.vert.glsl (100%) rename base/{Shaders => shaders}/smaa_neighborhood_blend.frag.glsl (100%) rename base/{Shaders => shaders}/smaa_neighborhood_blend.vert.glsl (100%) rename base/{Shaders => shaders}/ssao_blur_pass.frag.glsl (100%) rename base/{Shaders => shaders}/ssao_pass.frag.glsl (100%) rename base/{Shaders => shaders}/ssr_blur_pass.frag.glsl (100%) rename base/{Shaders => shaders}/ssr_pass.frag.glsl (100%) rename base/{Shaders => shaders}/std/brdf.glsl (100%) rename base/{Shaders => shaders}/std/conetrace.glsl (100%) rename base/{Shaders => shaders}/std/deferred_light.glsl (100%) rename base/{Shaders => shaders}/std/gbuffer.glsl (100%) rename base/{Shaders => shaders}/std/light.glsl (100%) rename base/{Shaders => shaders}/std/ltc.glsl (100%) rename base/{Shaders => shaders}/std/math.glsl (100%) rename base/{Shaders => shaders}/std/shirr.glsl (100%) rename base/{Shaders => shaders}/supersample_resolve.frag.glsl (100%) rename base/{Shaders => shaders}/taa_pass.frag.glsl (100%) rename base/{Shaders => shaders}/voxel_glsl/voxel_pos.frag.glsl (100%) rename base/{Shaders => shaders}/voxel_glsl/voxel_pos.geom.glsl (100%) rename base/{Shaders => shaders}/voxel_glsl/voxel_pos.vert.glsl (100%) rename base/{Shaders => shaders}/voxel_hlsl/src/build.bat (100%) rename base/{Shaders => shaders}/voxel_hlsl/src/hlslbin.exe (100%) rename base/{Shaders => shaders}/voxel_hlsl/src/voxel_pos.frag.hlsl (100%) rename base/{Shaders => shaders}/voxel_hlsl/src/voxel_pos.geom.hlsl (100%) rename base/{Shaders => shaders}/voxel_hlsl/src/voxel_pos.vert.hlsl (100%) create mode 100644 base/shaders/voxel_hlsl/voxel_pos.frag.glsl rename base/{Shaders => shaders}/voxel_hlsl/voxel_pos.geom.glsl (100%) create mode 100644 base/shaders/voxel_hlsl/voxel_pos.vert.glsl rename base/{Shaders => shaders}/world_pass.frag.glsl (100%) rename base/{Shaders => shaders}/world_pass.vert.glsl (100%) rename base/{Sources => sources}/args.ts (100%) rename base/{Sources => sources}/base.ts (100%) rename base/{Sources => sources}/box_export.ts (100%) rename base/{Sources => sources}/box_preferences.ts (100%) rename base/{Sources => sources}/box_projects.ts (100%) rename base/{Sources => sources}/camera.ts (100%) rename base/{Sources => sources}/config.ts (100%) rename base/{Sources => sources}/console.ts (100%) rename base/{Sources => sources}/context.ts (100%) rename base/{Sources => sources}/enums.ts (100%) rename base/{Sources => sources}/export_arm.ts (100%) rename base/{Sources => sources}/export_gpl.ts (100%) rename base/{Sources => sources}/export_mesh.ts (100%) rename base/{Sources => sources}/export_obj.ts (100%) rename base/{Sources => sources}/export_texture.ts (100%) rename base/{Sources => sources}/file.ts (100%) rename base/{Sources => sources}/geom.ts (96%) rename base/{Sources => sources}/gizmo.ts (100%) rename base/{Sources => sources}/history.ts (100%) rename base/{Sources => sources}/import_arm.ts (100%) rename base/{Sources => sources}/import_asset.ts (100%) rename base/{Sources => sources}/import_blend_material.ts (100%) rename base/{Sources => sources}/import_blend_mesh.ts (100%) rename base/{Sources => sources}/import_envmap.ts (100%) rename base/{Sources => sources}/import_font.ts (100%) rename base/{Sources => sources}/import_gpl.ts (100%) rename base/{Sources => sources}/import_keymap.ts (100%) rename base/{Sources => sources}/import_mesh.ts (96%) rename base/{Sources => sources}/import_obj.ts (91%) rename base/{Sources => sources}/import_plugin.ts (100%) rename base/{Sources => sources}/import_texture.ts (100%) rename base/{Sources => sources}/import_theme.ts (100%) rename base/{Sources => sources}/line_draw.ts (100%) rename base/{Sources => sources}/logic_node.ts (100%) rename base/{Sources => sources}/main.ts (100%) rename base/{Sources => sources}/make_voxel.ts (100%) rename base/{Sources => sources}/node_shader.ts (95%) rename base/{Sources => sources}/node_shader_context.ts (100%) rename base/{Sources => sources}/nodes/boolean_node.ts (100%) rename base/{Sources => sources}/nodes/color_node.ts (100%) rename base/{Sources => sources}/nodes/float_node.ts (100%) rename base/{Sources => sources}/nodes/integer_node.ts (100%) rename base/{Sources => sources}/nodes/math_node.ts (100%) rename base/{Sources => sources}/nodes/null_node.ts (100%) rename base/{Sources => sources}/nodes/random_node.ts (100%) rename base/{Sources => sources}/nodes/separate_vector_node.ts (100%) rename base/{Sources => sources}/nodes/string_node.ts (100%) rename base/{Sources => sources}/nodes/time_node.ts (100%) rename base/{Sources => sources}/nodes/vector_math_node.ts (100%) rename base/{Sources => sources}/nodes/vector_node.ts (100%) rename base/{Sources => sources}/nodes_material.ts (100%) rename base/{Sources => sources}/operator.ts (100%) rename base/{Sources => sources}/parser_blend.ts (100%) rename base/{Sources => sources}/parser_exr.ts (100%) rename base/{Sources => sources}/parser_logic.ts (100%) rename base/{Sources => sources}/parser_material.ts (100%) rename base/{Sources => sources}/path.ts (97%) rename base/{Sources => sources}/physics_body.ts (100%) rename base/{Sources => sources}/physics_bullet.ts (100%) rename base/{Sources => sources}/physics_world.ts (100%) rename base/{Sources => sources}/plugin.ts (100%) rename base/{Sources => sources}/project.ts (100%) rename base/{Sources => sources}/render_path_base.ts (100%) rename base/{Sources => sources}/render_path_deferred.ts (100%) rename base/{Sources => sources}/render_path_forward.ts (100%) rename base/{Sources => sources}/render_path_raytrace.ts (100%) rename base/{Sources => sources}/render_path_raytrace_bake.ts (100%) rename base/{Sources => sources}/resource.ts (100%) rename base/{Sources => sources}/strings.ts (100%) rename base/{Sources => sources}/tab_browser.ts (100%) rename base/{Sources => sources}/tab_brushes.ts (100%) rename base/{Sources => sources}/tab_console.ts (100%) rename base/{Sources => sources}/tab_fonts.ts (100%) rename base/{Sources => sources}/tab_history.ts (100%) rename base/{Sources => sources}/tab_materials.ts (100%) rename base/{Sources => sources}/tab_meshes.ts (100%) rename base/{Sources => sources}/tab_particles.ts (100%) rename base/{Sources => sources}/tab_plugins.ts (100%) rename base/{Sources => sources}/tab_script.ts (100%) rename base/{Sources => sources}/tab_swatches.ts (100%) rename base/{Sources => sources}/tab_textures.ts (100%) rename base/{Sources => sources}/translator.ts (97%) rename base/{Sources => sources}/ui_base.ts (100%) rename base/{Sources => sources}/ui_box.ts (100%) rename base/{Sources => sources}/ui_files.ts (100%) rename base/{Sources => sources}/ui_header.ts (100%) rename base/{Sources => sources}/ui_menu.ts (100%) rename base/{Sources => sources}/ui_menubar.ts (100%) rename base/{Sources => sources}/ui_nodes.ts (100%) rename base/{Sources => sources}/ui_status.ts (100%) rename base/{Sources => sources}/ui_toolbar.ts (100%) rename base/{Sources => sources}/ui_view2d.ts (100%) rename base/{Sources => sources}/uniforms_ext.ts (100%) rename base/{Sources => sources}/util_mesh.ts (97%) rename base/{Sources => sources}/util_particle.ts (100%) rename base/{Sources => sources}/util_render.ts (100%) rename base/{Sources => sources}/util_uv.ts (100%) rename base/{Sources => sources}/viewport.ts (100%) rename base/{Tools => tools}/extract_locales.js (100%) rename misc/pad/{Sources => sources}/main.ts (100%) diff --git a/.gitignore b/.gitignore index bd3347e3..c79165e5 100644 --- a/.gitignore +++ b/.gitignore @@ -2,7 +2,7 @@ .vscode *.DS_Store *.blend1 -armorlab/Assets/models/*.onnx -armorlab/Assets/models/*.txt +armorlab/assets/models/*.onnx +armorlab/assets/models/*.txt armorlab/onnx glsl_to_spirv diff --git a/armorforge/Assets/Scene.arm b/armorforge/assets/Scene.arm similarity index 100% rename from armorforge/Assets/Scene.arm rename to armorforge/assets/Scene.arm diff --git a/armorforge/Assets/badge.png b/armorforge/assets/badge.png similarity index 100% rename from armorforge/Assets/badge.png rename to armorforge/assets/badge.png diff --git a/armorforge/Assets/default_brush.arm b/armorforge/assets/default_brush.arm similarity index 100% rename from armorforge/Assets/default_brush.arm rename to armorforge/assets/default_brush.arm diff --git a/armorforge/Assets/default_material.arm b/armorforge/assets/default_material.arm similarity index 100% rename from armorforge/Assets/default_material.arm rename to armorforge/assets/default_material.arm diff --git a/armorforge/Assets/licenses/license.md b/armorforge/assets/licenses/license.md similarity index 100% rename from armorforge/Assets/licenses/license.md rename to armorforge/assets/licenses/license.md diff --git a/armorforge/Assets/licenses/plugins/keepme.txt b/armorforge/assets/licenses/plugins/keepme.txt similarity index 100% rename from armorforge/Assets/licenses/plugins/keepme.txt rename to armorforge/assets/licenses/plugins/keepme.txt diff --git a/armorforge/Assets/meshes/keepme.txt b/armorforge/assets/meshes/keepme.txt similarity index 100% rename from armorforge/Assets/meshes/keepme.txt rename to armorforge/assets/meshes/keepme.txt diff --git a/armorforge/Assets/plugins/hello_world.js b/armorforge/assets/plugins/hello_world.js similarity index 100% rename from armorforge/Assets/plugins/hello_world.js rename to armorforge/assets/plugins/hello_world.js diff --git a/armorforge/Assets/readme/readme.txt b/armorforge/assets/readme/readme.txt similarity index 100% rename from armorforge/Assets/readme/readme.txt rename to armorforge/assets/readme/readme.txt diff --git a/armorforge/Assets/readme/readme_android.txt b/armorforge/assets/readme/readme_android.txt similarity index 100% rename from armorforge/Assets/readme/readme_android.txt rename to armorforge/assets/readme/readme_android.txt diff --git a/armorforge/Assets/readme/readme_ios.txt b/armorforge/assets/readme/readme_ios.txt similarity index 100% rename from armorforge/Assets/readme/readme_ios.txt rename to armorforge/assets/readme/readme_ios.txt diff --git a/armorforge/Plugins/project.js b/armorforge/plugins/project.js similarity index 75% rename from armorforge/Plugins/project.js rename to armorforge/plugins/project.js index 580fc5e5..6e63632f 100644 --- a/armorforge/Plugins/project.js +++ b/armorforge/plugins/project.js @@ -1,6 +1,6 @@ let project = new Project('plugins'); -project.addFile('Sources/**'); +project.addFile('sources/**'); project.addDefine('WITH_PLUGIN_EMBED'); diff --git a/armorforge/Plugins/Sources/plugins.cpp b/armorforge/plugins/sources/plugins.cpp similarity index 100% rename from armorforge/Plugins/Sources/plugins.cpp rename to armorforge/plugins/sources/plugins.cpp diff --git a/armorforge/project.js b/armorforge/project.js index 2a5871f8..57639cd3 100644 --- a/armorforge/project.js +++ b/armorforge/project.js @@ -9,36 +9,36 @@ project.addDefine("is_forge"); project.addDefine("is_paint"); project.addProject("../base"); -project.addSources("../armorpaint/Sources"); //// -project.addShaders("../armorpaint/Shaders/*.glsl", { embed: flags.embed }); //// -project.addSources("Sources"); -project.addSources("Sources/nodes"); -project.addShaders("Shaders/*.glsl", { embed: flags.embed }); -project.addAssets("Assets/*", { destination: "data/{name}", embed: flags.embed }); -project.addAssets("Assets/keymap_presets/*", { destination: "data/keymap_presets/{name}" }); -project.addAssets("Assets/licenses/**", { destination: "data/licenses/{name}" }); -project.addAssets("Assets/plugins/*", { destination: "data/plugins/{name}" }); -project.addAssets("Assets/meshes/*", { destination: "data/meshes/{name}" }); -project.addAssets("Assets/readme/readme.txt", { destination: "{name}" }); +project.addSources("../armorpaint/sources"); //// +project.addShaders("../armorpaint/shaders/*.glsl", { embed: flags.embed }); //// +project.addSources("sources"); +project.addSources("sources/nodes"); +project.addShaders("shaders/*.glsl", { embed: flags.embed }); +project.addAssets("assets/*", { destination: "data/{name}", embed: flags.embed }); +project.addAssets("assets/keymap_presets/*", { destination: "data/keymap_presets/{name}" }); +project.addAssets("assets/licenses/**", { destination: "data/licenses/{name}" }); +project.addAssets("assets/plugins/*", { destination: "data/plugins/{name}" }); +project.addAssets("assets/meshes/*", { destination: "data/meshes/{name}" }); +project.addAssets("assets/readme/readme.txt", { destination: "{name}" }); if (flags.android) { - project.addAssets("Assets/readme/readme_android.txt", { destination: "{name}" }); + project.addAssets("assets/readme/readme_android.txt", { destination: "{name}" }); } else if (flags.ios) { - project.addAssets("Assets/readme/readme_ios.txt", { destination: "{name}" }); + project.addAssets("assets/readme/readme_ios.txt", { destination: "{name}" }); } if (flags.physics) { project.addDefine("arm_physics"); - project.addAssets("Assets/plugins/ammo/*", { destination: "data/plugins/{name}" }); + project.addAssets("assets/plugins/ammo/*", { destination: "data/plugins/{name}" }); } if (flags.raytrace) { if (flags.d3d12) { - project.addAssets("Assets/readme/readme_dxr.txt", { destination: "{name}" }); + project.addAssets("assets/readme/readme_dxr.txt", { destination: "{name}" }); } else if (flags.vulkan) { - project.addAssets("Assets/readme/readme_vkrt.txt", { destination: "{name}" }); + project.addAssets("assets/readme/readme_vkrt.txt", { destination: "{name}" }); } } diff --git a/armorforge/Shaders/keepme.txt b/armorforge/shaders/keepme.txt similarity index 100% rename from armorforge/Shaders/keepme.txt rename to armorforge/shaders/keepme.txt diff --git a/armorforge/Sources/manifest.ts b/armorforge/sources/manifest.ts similarity index 100% rename from armorforge/Sources/manifest.ts rename to armorforge/sources/manifest.ts diff --git a/armorforge/Sources/tab_objects.ts b/armorforge/sources/tab_objects.ts similarity index 100% rename from armorforge/Sources/tab_objects.ts rename to armorforge/sources/tab_objects.ts diff --git a/armorlab/Assets/Scene.arm b/armorlab/assets/Scene.arm similarity index 100% rename from armorlab/Assets/Scene.arm rename to armorlab/assets/Scene.arm diff --git a/armorlab/Assets/badge.png b/armorlab/assets/badge.png similarity index 100% rename from armorlab/Assets/badge.png rename to armorlab/assets/badge.png diff --git a/armorlab/Assets/default_brush.arm b/armorlab/assets/default_brush.arm similarity index 100% rename from armorlab/Assets/default_brush.arm rename to armorlab/assets/default_brush.arm diff --git a/armorlab/Assets/export_presets/base_color.json b/armorlab/assets/export_presets/base_color.json similarity index 100% rename from armorlab/Assets/export_presets/base_color.json rename to armorlab/assets/export_presets/base_color.json diff --git a/armorlab/Assets/export_presets/generic.json b/armorlab/assets/export_presets/generic.json similarity index 100% rename from armorlab/Assets/export_presets/generic.json rename to armorlab/assets/export_presets/generic.json diff --git a/armorlab/Assets/export_presets/minecraft_mer.json b/armorlab/assets/export_presets/minecraft_mer.json similarity index 100% rename from armorlab/Assets/export_presets/minecraft_mer.json rename to armorlab/assets/export_presets/minecraft_mer.json diff --git a/armorlab/Assets/export_presets/unigine.json b/armorlab/assets/export_presets/unigine.json similarity index 100% rename from armorlab/Assets/export_presets/unigine.json rename to armorlab/assets/export_presets/unigine.json diff --git a/armorlab/Assets/export_presets/unity.json b/armorlab/assets/export_presets/unity.json similarity index 100% rename from armorlab/Assets/export_presets/unity.json rename to armorlab/assets/export_presets/unity.json diff --git a/armorlab/Assets/export_presets/unreal.json b/armorlab/assets/export_presets/unreal.json similarity index 100% rename from armorlab/Assets/export_presets/unreal.json rename to armorlab/assets/export_presets/unreal.json diff --git a/armorlab/Assets/export_presets/xplane.json b/armorlab/assets/export_presets/xplane.json similarity index 100% rename from armorlab/Assets/export_presets/xplane.json rename to armorlab/assets/export_presets/xplane.json diff --git a/armorlab/Assets/keymap_presets/touch.json b/armorlab/assets/keymap_presets/touch.json similarity index 100% rename from armorlab/Assets/keymap_presets/touch.json rename to armorlab/assets/keymap_presets/touch.json diff --git a/armorlab/Assets/licenses/license.md b/armorlab/assets/licenses/license.md similarity index 100% rename from armorlab/Assets/licenses/license.md rename to armorlab/assets/licenses/license.md diff --git a/armorlab/Assets/licenses/license_esrgan.md b/armorlab/assets/licenses/license_esrgan.md similarity index 100% rename from armorlab/Assets/licenses/license_esrgan.md rename to armorlab/assets/licenses/license_esrgan.md diff --git a/armorlab/Assets/licenses/license_onnx.md b/armorlab/assets/licenses/license_onnx.md similarity index 100% rename from armorlab/Assets/licenses/license_onnx.md rename to armorlab/assets/licenses/license_onnx.md diff --git a/armorlab/Assets/licenses/license_photo_to_pbr.md b/armorlab/assets/licenses/license_photo_to_pbr.md similarity index 100% rename from armorlab/Assets/licenses/license_photo_to_pbr.md rename to armorlab/assets/licenses/license_photo_to_pbr.md diff --git a/armorlab/Assets/licenses/license_sd.md b/armorlab/assets/licenses/license_sd.md similarity index 100% rename from armorlab/Assets/licenses/license_sd.md rename to armorlab/assets/licenses/license_sd.md diff --git a/armorlab/Assets/licenses/license_texsynth.md b/armorlab/assets/licenses/license_texsynth.md similarity index 100% rename from armorlab/Assets/licenses/license_texsynth.md rename to armorlab/assets/licenses/license_texsynth.md diff --git a/armorlab/Assets/meshes/keepme.txt b/armorlab/assets/meshes/keepme.txt similarity index 100% rename from armorlab/Assets/meshes/keepme.txt rename to armorlab/assets/meshes/keepme.txt diff --git a/armorlab/Assets/models/README.md b/armorlab/assets/models/README.md similarity index 100% rename from armorlab/Assets/models/README.md rename to armorlab/assets/models/README.md diff --git a/armorlab/Assets/placeholder.png b/armorlab/assets/placeholder.png similarity index 100% rename from armorlab/Assets/placeholder.png rename to armorlab/assets/placeholder.png diff --git a/armorlab/Assets/plugins/dev/texture_breakdown.js b/armorlab/assets/plugins/dev/texture_breakdown.js similarity index 100% rename from armorlab/Assets/plugins/dev/texture_breakdown.js rename to armorlab/assets/plugins/dev/texture_breakdown.js diff --git a/armorlab/Assets/plugins/hello_node_brush.js b/armorlab/assets/plugins/hello_node_brush.js similarity index 100% rename from armorlab/Assets/plugins/hello_node_brush.js rename to armorlab/assets/plugins/hello_node_brush.js diff --git a/armorlab/Assets/plugins/hello_world.js b/armorlab/assets/plugins/hello_world.js similarity index 100% rename from armorlab/Assets/plugins/hello_world.js rename to armorlab/assets/plugins/hello_world.js diff --git a/armorlab/Assets/plugins/import_svg.js b/armorlab/assets/plugins/import_svg.js similarity index 100% rename from armorlab/Assets/plugins/import_svg.js rename to armorlab/assets/plugins/import_svg.js diff --git a/armorlab/Assets/readme/readme.txt b/armorlab/assets/readme/readme.txt similarity index 100% rename from armorlab/Assets/readme/readme.txt rename to armorlab/assets/readme/readme.txt diff --git a/armorlab/Assets/readme/readme_android.txt b/armorlab/assets/readme/readme_android.txt similarity index 100% rename from armorlab/Assets/readme/readme_android.txt rename to armorlab/assets/readme/readme_android.txt diff --git a/armorlab/Assets/readme/readme_dxr.txt b/armorlab/assets/readme/readme_dxr.txt similarity index 100% rename from armorlab/Assets/readme/readme_dxr.txt rename to armorlab/assets/readme/readme_dxr.txt diff --git a/armorlab/Assets/readme/readme_ios.txt b/armorlab/assets/readme/readme_ios.txt similarity index 100% rename from armorlab/Assets/readme/readme_ios.txt rename to armorlab/assets/readme/readme_ios.txt diff --git a/armorlab/Assets/readme/readme_vkrt.txt b/armorlab/assets/readme/readme_vkrt.txt similarity index 100% rename from armorlab/Assets/readme/readme_vkrt.txt rename to armorlab/assets/readme/readme_vkrt.txt diff --git a/armorlab/Plugins/project.js b/armorlab/plugins/project.js similarity index 55% rename from armorlab/Plugins/project.js rename to armorlab/plugins/project.js index 12310ab5..d310c176 100644 --- a/armorlab/Plugins/project.js +++ b/armorlab/plugins/project.js @@ -1,18 +1,18 @@ let project = new Project('plugins'); -project.addFile('Sources/**'); +project.addFile('sources/**'); project.addDefine('WITH_PLUGIN_EMBED'); if (platform === Platform.Windows) { - project.addLib('Sources/proc_texsynth/win32/texsynth'); + project.addLib('sources/proc_texsynth/win32/texsynth'); } else if (platform === Platform.Linux) { - process.env.LIBRARY_PATH = project.basedir + "/Sources/proc_texsynth/linux"; + process.env.LIBRARY_PATH = project.basedir + "/sources/proc_texsynth/linux"; project.addLib('texsynth'); } else if (platform === Platform.OSX) { - project.addLib('Sources/proc_texsynth/macos/libtexsynth.a'); + project.addLib('sources/proc_texsynth/macos/libtexsynth.a'); } return project; diff --git a/armorlab/Plugins/Sources/plugins.cpp b/armorlab/plugins/sources/plugins.cpp similarity index 100% rename from armorlab/Plugins/Sources/plugins.cpp rename to armorlab/plugins/sources/plugins.cpp diff --git a/armorlab/Plugins/Sources/proc_texsynth/LICENSE.md b/armorlab/plugins/sources/proc_texsynth/LICENSE.md similarity index 100% rename from armorlab/Plugins/Sources/proc_texsynth/LICENSE.md rename to armorlab/plugins/sources/proc_texsynth/LICENSE.md diff --git a/armorlab/Plugins/Sources/proc_texsynth/linux/libtexsynth.a b/armorlab/plugins/sources/proc_texsynth/linux/libtexsynth.a similarity index 100% rename from armorlab/Plugins/Sources/proc_texsynth/linux/libtexsynth.a rename to armorlab/plugins/sources/proc_texsynth/linux/libtexsynth.a diff --git a/armorlab/Plugins/Sources/proc_texsynth/macos/libtexsynth.a b/armorlab/plugins/sources/proc_texsynth/macos/libtexsynth.a similarity index 100% rename from armorlab/Plugins/Sources/proc_texsynth/macos/libtexsynth.a rename to armorlab/plugins/sources/proc_texsynth/macos/libtexsynth.a diff --git a/armorlab/Plugins/Sources/proc_texsynth/win32/texsynth.lib b/armorlab/plugins/sources/proc_texsynth/win32/texsynth.lib similarity index 100% rename from armorlab/Plugins/Sources/proc_texsynth/win32/texsynth.lib rename to armorlab/plugins/sources/proc_texsynth/win32/texsynth.lib diff --git a/armorlab/project.js b/armorlab/project.js index f64a8fb7..ad8311be 100644 --- a/armorlab/project.js +++ b/armorlab/project.js @@ -8,24 +8,24 @@ let project = new Project(flags.name); project.addDefine("is_lab"); project.addProject("../base"); -project.addSources("Sources"); -project.addSources("Sources/nodes"); -project.addShaders("Shaders/*.glsl", { embed: flags.embed }); -project.addAssets("Assets/*", { destination: "data/{name}", embed: flags.embed }); -project.addAssets("Assets/export_presets/*", { destination: "data/export_presets/{name}" }); -project.addAssets("Assets/keymap_presets/*", { destination: "data/keymap_presets/{name}" }); -project.addAssets("Assets/licenses/**", { destination: "data/licenses/{name}" }); -project.addAssets("Assets/plugins/*", { destination: "data/plugins/{name}" }); -project.addAssets("Assets/meshes/*", { destination: "data/meshes/{name}" }); -project.addAssets("Assets/models/*.onnx", { destination: "data/models/{name}" }); -project.addAssets("Assets/models/LICENSE.txt", { destination: "data/models/LICENSE.txt" }); -project.addAssets("Assets/readme/readme.txt", { destination: "{name}" }); +project.addSources("sources"); +project.addSources("sources/nodes"); +project.addShaders("shaders/*.glsl", { embed: flags.embed }); +project.addAssets("assets/*", { destination: "data/{name}", embed: flags.embed }); +project.addAssets("assets/export_presets/*", { destination: "data/export_presets/{name}" }); +project.addAssets("assets/keymap_presets/*", { destination: "data/keymap_presets/{name}" }); +project.addAssets("assets/licenses/**", { destination: "data/licenses/{name}" }); +project.addAssets("assets/plugins/*", { destination: "data/plugins/{name}" }); +project.addAssets("assets/meshes/*", { destination: "data/meshes/{name}" }); +project.addAssets("assets/models/*.onnx", { destination: "data/models/{name}" }); +project.addAssets("assets/models/LICENSE.txt", { destination: "data/models/LICENSE.txt" }); +project.addAssets("assets/readme/readme.txt", { destination: "{name}" }); if (flags.android) { - project.addAssets("Assets/readme/readme_android.txt", { destination: "{name}" }); + project.addAssets("assets/readme/readme_android.txt", { destination: "{name}" }); } else if (flags.ios) { - project.addAssets("Assets/readme/readme_ios.txt", { destination: "{name}" }); + project.addAssets("assets/readme/readme_ios.txt", { destination: "{name}" }); } if (process.platform === "win32") { @@ -37,10 +37,10 @@ else if (process.platform === "linux") { if (flags.raytrace) { if (flags.d3d12) { - project.addAssets("Assets/readme/readme_dxr.txt", { destination: "{name}" }); + project.addAssets("assets/readme/readme_dxr.txt", { destination: "{name}" }); } else if (flags.vulkan) { - project.addAssets("Assets/readme/readme_vkrt.txt", { destination: "{name}" }); + project.addAssets("assets/readme/readme_vkrt.txt", { destination: "{name}" }); } } diff --git a/armorlab/Shaders/inpaint_preview.frag.glsl b/armorlab/shaders/inpaint_preview.frag.glsl similarity index 100% rename from armorlab/Shaders/inpaint_preview.frag.glsl rename to armorlab/shaders/inpaint_preview.frag.glsl diff --git a/armorlab/Shaders/layer_copy_rrrr.frag.glsl b/armorlab/shaders/layer_copy_rrrr.frag.glsl similarity index 100% rename from armorlab/Shaders/layer_copy_rrrr.frag.glsl rename to armorlab/shaders/layer_copy_rrrr.frag.glsl diff --git a/armorlab/Sources/make_material.ts b/armorlab/sources/make_material.ts similarity index 100% rename from armorlab/Sources/make_material.ts rename to armorlab/sources/make_material.ts diff --git a/armorlab/Sources/make_mesh.ts b/armorlab/sources/make_mesh.ts similarity index 100% rename from armorlab/Sources/make_mesh.ts rename to armorlab/sources/make_mesh.ts diff --git a/armorlab/Sources/make_paint.ts b/armorlab/sources/make_paint.ts similarity index 100% rename from armorlab/Sources/make_paint.ts rename to armorlab/sources/make_paint.ts diff --git a/armorlab/Sources/manifest.ts b/armorlab/sources/manifest.ts similarity index 100% rename from armorlab/Sources/manifest.ts rename to armorlab/sources/manifest.ts diff --git a/armorlab/Sources/nodes/brush_output_node.ts b/armorlab/sources/nodes/brush_output_node.ts similarity index 100% rename from armorlab/Sources/nodes/brush_output_node.ts rename to armorlab/sources/nodes/brush_output_node.ts diff --git a/armorlab/Sources/nodes/image_texture_node.ts b/armorlab/sources/nodes/image_texture_node.ts similarity index 100% rename from armorlab/Sources/nodes/image_texture_node.ts rename to armorlab/sources/nodes/image_texture_node.ts diff --git a/armorlab/Sources/nodes/inpaint_node.ts b/armorlab/sources/nodes/inpaint_node.ts similarity index 100% rename from armorlab/Sources/nodes/inpaint_node.ts rename to armorlab/sources/nodes/inpaint_node.ts diff --git a/armorlab/Sources/nodes/photo_to_pbr_node.ts b/armorlab/sources/nodes/photo_to_pbr_node.ts similarity index 100% rename from armorlab/Sources/nodes/photo_to_pbr_node.ts rename to armorlab/sources/nodes/photo_to_pbr_node.ts diff --git a/armorlab/Sources/nodes/rgb_node.ts b/armorlab/sources/nodes/rgb_node.ts similarity index 100% rename from armorlab/Sources/nodes/rgb_node.ts rename to armorlab/sources/nodes/rgb_node.ts diff --git a/armorlab/Sources/nodes/text_to_photo_node.ts b/armorlab/sources/nodes/text_to_photo_node.ts similarity index 100% rename from armorlab/Sources/nodes/text_to_photo_node.ts rename to armorlab/sources/nodes/text_to_photo_node.ts diff --git a/armorlab/Sources/nodes/tiling_node.ts b/armorlab/sources/nodes/tiling_node.ts similarity index 100% rename from armorlab/Sources/nodes/tiling_node.ts rename to armorlab/sources/nodes/tiling_node.ts diff --git a/armorlab/Sources/nodes/upscale_node.ts b/armorlab/sources/nodes/upscale_node.ts similarity index 100% rename from armorlab/Sources/nodes/upscale_node.ts rename to armorlab/sources/nodes/upscale_node.ts diff --git a/armorlab/Sources/nodes/variance_node.ts b/armorlab/sources/nodes/variance_node.ts similarity index 100% rename from armorlab/Sources/nodes/variance_node.ts rename to armorlab/sources/nodes/variance_node.ts diff --git a/armorlab/Sources/nodes_brush.ts b/armorlab/sources/nodes_brush.ts similarity index 100% rename from armorlab/Sources/nodes_brush.ts rename to armorlab/sources/nodes_brush.ts diff --git a/armorlab/Sources/render_path_paint.ts b/armorlab/sources/render_path_paint.ts similarity index 100% rename from armorlab/Sources/render_path_paint.ts rename to armorlab/sources/render_path_paint.ts diff --git a/armorlab/Sources/ui_nodes_ext.ts b/armorlab/sources/ui_nodes_ext.ts similarity index 100% rename from armorlab/Sources/ui_nodes_ext.ts rename to armorlab/sources/ui_nodes_ext.ts diff --git a/armorpaint/Assets/Scene.arm b/armorpaint/assets/Scene.arm similarity index 100% rename from armorpaint/Assets/Scene.arm rename to armorpaint/assets/Scene.arm diff --git a/armorpaint/Assets/badge.png b/armorpaint/assets/badge.png similarity index 100% rename from armorpaint/Assets/badge.png rename to armorpaint/assets/badge.png diff --git a/armorpaint/Assets/default_brush.arm b/armorpaint/assets/default_brush.arm similarity index 100% rename from armorpaint/Assets/default_brush.arm rename to armorpaint/assets/default_brush.arm diff --git a/armorpaint/Assets/default_material.arm b/armorpaint/assets/default_material.arm similarity index 100% rename from armorpaint/Assets/default_material.arm rename to armorpaint/assets/default_material.arm diff --git a/armorpaint/Assets/export_presets/base_color.json b/armorpaint/assets/export_presets/base_color.json similarity index 100% rename from armorpaint/Assets/export_presets/base_color.json rename to armorpaint/assets/export_presets/base_color.json diff --git a/armorpaint/Assets/export_presets/generic.json b/armorpaint/assets/export_presets/generic.json similarity index 100% rename from armorpaint/Assets/export_presets/generic.json rename to armorpaint/assets/export_presets/generic.json diff --git a/armorpaint/Assets/export_presets/minecraft_mer.json b/armorpaint/assets/export_presets/minecraft_mer.json similarity index 100% rename from armorpaint/Assets/export_presets/minecraft_mer.json rename to armorpaint/assets/export_presets/minecraft_mer.json diff --git a/armorpaint/Assets/export_presets/unigine.json b/armorpaint/assets/export_presets/unigine.json similarity index 100% rename from armorpaint/Assets/export_presets/unigine.json rename to armorpaint/assets/export_presets/unigine.json diff --git a/armorpaint/Assets/export_presets/unity.json b/armorpaint/assets/export_presets/unity.json similarity index 100% rename from armorpaint/Assets/export_presets/unity.json rename to armorpaint/assets/export_presets/unity.json diff --git a/armorpaint/Assets/export_presets/unreal.json b/armorpaint/assets/export_presets/unreal.json similarity index 100% rename from armorpaint/Assets/export_presets/unreal.json rename to armorpaint/assets/export_presets/unreal.json diff --git a/armorpaint/Assets/export_presets/xplane.json b/armorpaint/assets/export_presets/xplane.json similarity index 100% rename from armorpaint/Assets/export_presets/xplane.json rename to armorpaint/assets/export_presets/xplane.json diff --git a/armorpaint/Assets/keymap_presets/blender.json b/armorpaint/assets/keymap_presets/blender.json similarity index 100% rename from armorpaint/Assets/keymap_presets/blender.json rename to armorpaint/assets/keymap_presets/blender.json diff --git a/armorpaint/Assets/keymap_presets/touch.json b/armorpaint/assets/keymap_presets/touch.json similarity index 100% rename from armorpaint/Assets/keymap_presets/touch.json rename to armorpaint/assets/keymap_presets/touch.json diff --git a/armorpaint/Assets/licenses/license.md b/armorpaint/assets/licenses/license.md similarity index 100% rename from armorpaint/Assets/licenses/license.md rename to armorpaint/assets/licenses/license.md diff --git a/armorpaint/Assets/licenses/license_cycles_nodes.md b/armorpaint/assets/licenses/license_cycles_nodes.md similarity index 100% rename from armorpaint/Assets/licenses/license_cycles_nodes.md rename to armorpaint/assets/licenses/license_cycles_nodes.md diff --git a/armorpaint/Assets/licenses/plugins/license_cgltf.md b/armorpaint/assets/licenses/plugins/license_cgltf.md similarity index 100% rename from armorpaint/Assets/licenses/plugins/license_cgltf.md rename to armorpaint/assets/licenses/plugins/license_cgltf.md diff --git a/armorpaint/Assets/licenses/plugins/license_nanosvg.md b/armorpaint/assets/licenses/plugins/license_nanosvg.md similarity index 100% rename from armorpaint/Assets/licenses/plugins/license_nanosvg.md rename to armorpaint/assets/licenses/plugins/license_nanosvg.md diff --git a/armorpaint/Assets/licenses/plugins/license_tinyusdz.md b/armorpaint/assets/licenses/plugins/license_tinyusdz.md similarity index 100% rename from armorpaint/Assets/licenses/plugins/license_tinyusdz.md rename to armorpaint/assets/licenses/plugins/license_tinyusdz.md diff --git a/armorpaint/Assets/licenses/plugins/license_utif.md b/armorpaint/assets/licenses/plugins/license_utif.md similarity index 100% rename from armorpaint/Assets/licenses/plugins/license_utif.md rename to armorpaint/assets/licenses/plugins/license_utif.md diff --git a/armorpaint/Assets/licenses/plugins/license_xatlas.md b/armorpaint/assets/licenses/plugins/license_xatlas.md similarity index 100% rename from armorpaint/Assets/licenses/plugins/license_xatlas.md rename to armorpaint/assets/licenses/plugins/license_xatlas.md diff --git a/armorpaint/Assets/meshes/cube_shared_uvs.arm b/armorpaint/assets/meshes/cube_shared_uvs.arm similarity index 100% rename from armorpaint/Assets/meshes/cube_shared_uvs.arm rename to armorpaint/assets/meshes/cube_shared_uvs.arm diff --git a/armorpaint/Assets/plugins/ammo/ammo.js b/armorpaint/assets/plugins/ammo/ammo.js similarity index 100% rename from armorpaint/Assets/plugins/ammo/ammo.js rename to armorpaint/assets/plugins/ammo/ammo.js diff --git a/armorpaint/Assets/plugins/dev/converter.js b/armorpaint/assets/plugins/dev/converter.js similarity index 100% rename from armorpaint/Assets/plugins/dev/converter.js rename to armorpaint/assets/plugins/dev/converter.js diff --git a/armorpaint/Assets/plugins/hello_node.js b/armorpaint/assets/plugins/hello_node.js similarity index 100% rename from armorpaint/Assets/plugins/hello_node.js rename to armorpaint/assets/plugins/hello_node.js diff --git a/armorpaint/Assets/plugins/hello_node_brush.js b/armorpaint/assets/plugins/hello_node_brush.js similarity index 100% rename from armorpaint/Assets/plugins/hello_node_brush.js rename to armorpaint/assets/plugins/hello_node_brush.js diff --git a/armorpaint/Assets/plugins/hello_world.js b/armorpaint/assets/plugins/hello_world.js similarity index 100% rename from armorpaint/Assets/plugins/hello_world.js rename to armorpaint/assets/plugins/hello_world.js diff --git a/armorpaint/Assets/plugins/import_fbx.js b/armorpaint/assets/plugins/import_fbx.js similarity index 100% rename from armorpaint/Assets/plugins/import_fbx.js rename to armorpaint/assets/plugins/import_fbx.js diff --git a/armorpaint/Assets/plugins/import_gltf_glb.js b/armorpaint/assets/plugins/import_gltf_glb.js similarity index 100% rename from armorpaint/Assets/plugins/import_gltf_glb.js rename to armorpaint/assets/plugins/import_gltf_glb.js diff --git a/armorpaint/Assets/plugins/import_stl.js b/armorpaint/assets/plugins/import_stl.js similarity index 100% rename from armorpaint/Assets/plugins/import_stl.js rename to armorpaint/assets/plugins/import_stl.js diff --git a/armorpaint/Assets/plugins/import_svg.js b/armorpaint/assets/plugins/import_svg.js similarity index 100% rename from armorpaint/Assets/plugins/import_svg.js rename to armorpaint/assets/plugins/import_svg.js diff --git a/armorpaint/Assets/plugins/import_usdc.js b/armorpaint/assets/plugins/import_usdc.js similarity index 100% rename from armorpaint/Assets/plugins/import_usdc.js rename to armorpaint/assets/plugins/import_usdc.js diff --git a/armorpaint/Assets/plugins/texture_breakdown.js b/armorpaint/assets/plugins/texture_breakdown.js similarity index 100% rename from armorpaint/Assets/plugins/texture_breakdown.js rename to armorpaint/assets/plugins/texture_breakdown.js diff --git a/armorpaint/Assets/plugins/uv_unwrap.js b/armorpaint/assets/plugins/uv_unwrap.js similarity index 100% rename from armorpaint/Assets/plugins/uv_unwrap.js rename to armorpaint/assets/plugins/uv_unwrap.js diff --git a/armorpaint/Assets/plugins/viewport_celshade.js b/armorpaint/assets/plugins/viewport_celshade.js similarity index 100% rename from armorpaint/Assets/plugins/viewport_celshade.js rename to armorpaint/assets/plugins/viewport_celshade.js diff --git a/armorpaint/Assets/readme/readme.txt b/armorpaint/assets/readme/readme.txt similarity index 100% rename from armorpaint/Assets/readme/readme.txt rename to armorpaint/assets/readme/readme.txt diff --git a/armorpaint/Assets/readme/readme_android.txt b/armorpaint/assets/readme/readme_android.txt similarity index 100% rename from armorpaint/Assets/readme/readme_android.txt rename to armorpaint/assets/readme/readme_android.txt diff --git a/armorpaint/Assets/readme/readme_dxr.txt b/armorpaint/assets/readme/readme_dxr.txt similarity index 100% rename from armorpaint/Assets/readme/readme_dxr.txt rename to armorpaint/assets/readme/readme_dxr.txt diff --git a/armorpaint/Assets/readme/readme_ios.txt b/armorpaint/assets/readme/readme_ios.txt similarity index 100% rename from armorpaint/Assets/readme/readme_ios.txt rename to armorpaint/assets/readme/readme_ios.txt diff --git a/armorpaint/Assets/readme/readme_vkrt.txt b/armorpaint/assets/readme/readme_vkrt.txt similarity index 100% rename from armorpaint/Assets/readme/readme_vkrt.txt rename to armorpaint/assets/readme/readme_vkrt.txt diff --git a/armorpaint/Assets/readme/readme_vr.txt b/armorpaint/assets/readme/readme_vr.txt similarity index 100% rename from armorpaint/Assets/readme/readme_vr.txt rename to armorpaint/assets/readme/readme_vr.txt diff --git a/armorpaint/Plugins/project.js b/armorpaint/plugins/project.js similarity index 81% rename from armorpaint/Plugins/project.js rename to armorpaint/plugins/project.js index aec95e6f..9f33f080 100644 --- a/armorpaint/Plugins/project.js +++ b/armorpaint/plugins/project.js @@ -1,6 +1,6 @@ let project = new Project('plugins'); -// project.addFile('Sources/**'); //// +// project.addFile('sources/**'); //// project.addDefine('WITH_PLUGIN_EMBED'); project.addDefine('TINYUSDZ_NO_STB_IMAGE_IMPLEMENTATION'); diff --git a/armorpaint/Plugins/Sources/io_dds/LICENSE.md b/armorpaint/plugins/sources/io_dds/LICENSE.md similarity index 100% rename from armorpaint/Plugins/Sources/io_dds/LICENSE.md rename to armorpaint/plugins/sources/io_dds/LICENSE.md diff --git a/armorpaint/Plugins/Sources/io_dds/tinyddsloader.cpp b/armorpaint/plugins/sources/io_dds/tinyddsloader.cpp similarity index 100% rename from armorpaint/Plugins/Sources/io_dds/tinyddsloader.cpp rename to armorpaint/plugins/sources/io_dds/tinyddsloader.cpp diff --git a/armorpaint/Plugins/Sources/io_dds/tinyddsloader.h b/armorpaint/plugins/sources/io_dds/tinyddsloader.h similarity index 100% rename from armorpaint/Plugins/Sources/io_dds/tinyddsloader.h rename to armorpaint/plugins/sources/io_dds/tinyddsloader.h diff --git a/armorpaint/Plugins/Sources/io_fbx/io_fbx.c b/armorpaint/plugins/sources/io_fbx/io_fbx.c similarity index 100% rename from armorpaint/Plugins/Sources/io_fbx/io_fbx.c rename to armorpaint/plugins/sources/io_fbx/io_fbx.c diff --git a/armorpaint/Plugins/Sources/io_fbx/ufbx/LICENSE b/armorpaint/plugins/sources/io_fbx/ufbx/LICENSE similarity index 100% rename from armorpaint/Plugins/Sources/io_fbx/ufbx/LICENSE rename to armorpaint/plugins/sources/io_fbx/ufbx/LICENSE diff --git a/armorpaint/Plugins/Sources/io_fbx/ufbx/ufbx.c b/armorpaint/plugins/sources/io_fbx/ufbx/ufbx.c similarity index 100% rename from armorpaint/Plugins/Sources/io_fbx/ufbx/ufbx.c rename to armorpaint/plugins/sources/io_fbx/ufbx/ufbx.c diff --git a/armorpaint/Plugins/Sources/io_fbx/ufbx/ufbx.h b/armorpaint/plugins/sources/io_fbx/ufbx/ufbx.h similarity index 100% rename from armorpaint/Plugins/Sources/io_fbx/ufbx/ufbx.h rename to armorpaint/plugins/sources/io_fbx/ufbx/ufbx.h diff --git a/armorpaint/Plugins/Sources/io_gltf/LICENSE.md b/armorpaint/plugins/sources/io_gltf/LICENSE.md similarity index 100% rename from armorpaint/Plugins/Sources/io_gltf/LICENSE.md rename to armorpaint/plugins/sources/io_gltf/LICENSE.md diff --git a/armorpaint/Plugins/Sources/io_gltf/cgltf.c b/armorpaint/plugins/sources/io_gltf/cgltf.c similarity index 100% rename from armorpaint/Plugins/Sources/io_gltf/cgltf.c rename to armorpaint/plugins/sources/io_gltf/cgltf.c diff --git a/armorpaint/Plugins/Sources/io_gltf/cgltf.h b/armorpaint/plugins/sources/io_gltf/cgltf.h similarity index 100% rename from armorpaint/Plugins/Sources/io_gltf/cgltf.h rename to armorpaint/plugins/sources/io_gltf/cgltf.h diff --git a/armorpaint/Plugins/Sources/io_svg/LICENSE.md b/armorpaint/plugins/sources/io_svg/LICENSE.md similarity index 100% rename from armorpaint/Plugins/Sources/io_svg/LICENSE.md rename to armorpaint/plugins/sources/io_svg/LICENSE.md diff --git a/armorpaint/Plugins/Sources/io_svg/nanosvg.c b/armorpaint/plugins/sources/io_svg/nanosvg.c similarity index 100% rename from armorpaint/Plugins/Sources/io_svg/nanosvg.c rename to armorpaint/plugins/sources/io_svg/nanosvg.c diff --git a/armorpaint/Plugins/Sources/io_svg/nanosvg.h b/armorpaint/plugins/sources/io_svg/nanosvg.h similarity index 100% rename from armorpaint/Plugins/Sources/io_svg/nanosvg.h rename to armorpaint/plugins/sources/io_svg/nanosvg.h diff --git a/armorpaint/Plugins/Sources/io_svg/nanosvgrast.h b/armorpaint/plugins/sources/io_svg/nanosvgrast.h similarity index 100% rename from armorpaint/Plugins/Sources/io_svg/nanosvgrast.h rename to armorpaint/plugins/sources/io_svg/nanosvgrast.h diff --git a/armorpaint/Plugins/Sources/io_usd/io_usd.cc b/armorpaint/plugins/sources/io_usd/io_usd.cc similarity index 100% rename from armorpaint/Plugins/Sources/io_usd/io_usd.cc rename to armorpaint/plugins/sources/io_usd/io_usd.cc diff --git a/armorpaint/Plugins/Sources/io_usd/tinyusdz/LICENSE b/armorpaint/plugins/sources/io_usd/tinyusdz/LICENSE similarity index 100% rename from armorpaint/Plugins/Sources/io_usd/tinyusdz/LICENSE rename to armorpaint/plugins/sources/io_usd/tinyusdz/LICENSE diff --git a/armorpaint/Plugins/Sources/io_usd/tinyusdz/external/stb_image.h b/armorpaint/plugins/sources/io_usd/tinyusdz/external/stb_image.h similarity index 100% rename from armorpaint/Plugins/Sources/io_usd/tinyusdz/external/stb_image.h rename to armorpaint/plugins/sources/io_usd/tinyusdz/external/stb_image.h diff --git a/armorpaint/Plugins/Sources/io_usd/tinyusdz/integerCoding.cpp b/armorpaint/plugins/sources/io_usd/tinyusdz/integerCoding.cpp similarity index 100% rename from armorpaint/Plugins/Sources/io_usd/tinyusdz/integerCoding.cpp rename to armorpaint/plugins/sources/io_usd/tinyusdz/integerCoding.cpp diff --git a/armorpaint/Plugins/Sources/io_usd/tinyusdz/integerCoding.h b/armorpaint/plugins/sources/io_usd/tinyusdz/integerCoding.h similarity index 100% rename from armorpaint/Plugins/Sources/io_usd/tinyusdz/integerCoding.h rename to armorpaint/plugins/sources/io_usd/tinyusdz/integerCoding.h diff --git a/armorpaint/Plugins/Sources/io_usd/tinyusdz/lz4-compression.cc b/armorpaint/plugins/sources/io_usd/tinyusdz/lz4-compression.cc similarity index 100% rename from armorpaint/Plugins/Sources/io_usd/tinyusdz/lz4-compression.cc rename to armorpaint/plugins/sources/io_usd/tinyusdz/lz4-compression.cc diff --git a/armorpaint/Plugins/Sources/io_usd/tinyusdz/lz4-compression.hh b/armorpaint/plugins/sources/io_usd/tinyusdz/lz4-compression.hh similarity index 100% rename from armorpaint/Plugins/Sources/io_usd/tinyusdz/lz4-compression.hh rename to armorpaint/plugins/sources/io_usd/tinyusdz/lz4-compression.hh diff --git a/armorpaint/Plugins/Sources/io_usd/tinyusdz/pxrLZ4/lz4.cpp b/armorpaint/plugins/sources/io_usd/tinyusdz/pxrLZ4/lz4.cpp similarity index 100% rename from armorpaint/Plugins/Sources/io_usd/tinyusdz/pxrLZ4/lz4.cpp rename to armorpaint/plugins/sources/io_usd/tinyusdz/pxrLZ4/lz4.cpp diff --git a/armorpaint/Plugins/Sources/io_usd/tinyusdz/pxrLZ4/lz4.h b/armorpaint/plugins/sources/io_usd/tinyusdz/pxrLZ4/lz4.h similarity index 100% rename from armorpaint/Plugins/Sources/io_usd/tinyusdz/pxrLZ4/lz4.h rename to armorpaint/plugins/sources/io_usd/tinyusdz/pxrLZ4/lz4.h diff --git a/armorpaint/Plugins/Sources/io_usd/tinyusdz/stream-reader.hh b/armorpaint/plugins/sources/io_usd/tinyusdz/stream-reader.hh similarity index 100% rename from armorpaint/Plugins/Sources/io_usd/tinyusdz/stream-reader.hh rename to armorpaint/plugins/sources/io_usd/tinyusdz/stream-reader.hh diff --git a/armorpaint/Plugins/Sources/io_usd/tinyusdz/tinyusdz.cc b/armorpaint/plugins/sources/io_usd/tinyusdz/tinyusdz.cc similarity index 100% rename from armorpaint/Plugins/Sources/io_usd/tinyusdz/tinyusdz.cc rename to armorpaint/plugins/sources/io_usd/tinyusdz/tinyusdz.cc diff --git a/armorpaint/Plugins/Sources/io_usd/tinyusdz/tinyusdz.hh b/armorpaint/plugins/sources/io_usd/tinyusdz/tinyusdz.hh similarity index 100% rename from armorpaint/Plugins/Sources/io_usd/tinyusdz/tinyusdz.hh rename to armorpaint/plugins/sources/io_usd/tinyusdz/tinyusdz.hh diff --git a/armorpaint/Plugins/Sources/plugins.cpp b/armorpaint/plugins/sources/plugins.cpp similarity index 100% rename from armorpaint/Plugins/Sources/plugins.cpp rename to armorpaint/plugins/sources/plugins.cpp diff --git a/armorpaint/Plugins/Sources/proc_xatlas/LICENSE.md b/armorpaint/plugins/sources/proc_xatlas/LICENSE.md similarity index 100% rename from armorpaint/Plugins/Sources/proc_xatlas/LICENSE.md rename to armorpaint/plugins/sources/proc_xatlas/LICENSE.md diff --git a/armorpaint/Plugins/Sources/proc_xatlas/xatlas.cpp b/armorpaint/plugins/sources/proc_xatlas/xatlas.cpp similarity index 100% rename from armorpaint/Plugins/Sources/proc_xatlas/xatlas.cpp rename to armorpaint/plugins/sources/proc_xatlas/xatlas.cpp diff --git a/armorpaint/Plugins/Sources/proc_xatlas/xatlas.h b/armorpaint/plugins/sources/proc_xatlas/xatlas.h similarity index 100% rename from armorpaint/Plugins/Sources/proc_xatlas/xatlas.h rename to armorpaint/plugins/sources/proc_xatlas/xatlas.h diff --git a/armorpaint/project.js b/armorpaint/project.js index 99b63ab1..1722a9be 100644 --- a/armorpaint/project.js +++ b/armorpaint/project.js @@ -7,35 +7,35 @@ let project = new Project(flags.name); project.addDefine("is_paint"); project.addProject("../base"); -project.addSources("Sources"); -project.addSources("Sources/nodes"); -project.addShaders("Shaders/*.glsl", { embed: flags.embed }); -project.addAssets("Assets/*", { destination: "data/{name}", embed: flags.embed }); -project.addAssets("Assets/export_presets/*", { destination: "data/export_presets/{name}" }); -project.addAssets("Assets/keymap_presets/*", { destination: "data/keymap_presets/{name}" }); -project.addAssets("Assets/licenses/**", { destination: "data/licenses/{name}" }); -project.addAssets("Assets/plugins/*", { destination: "data/plugins/{name}" }); -project.addAssets("Assets/meshes/*", { destination: "data/meshes/{name}" }); -project.addAssets("Assets/readme/readme.txt", { destination: "{name}" }); +project.addSources("sources"); +project.addSources("sources/nodes"); +project.addShaders("shaders/*.glsl", { embed: flags.embed }); +project.addAssets("assets/*", { destination: "data/{name}", embed: flags.embed }); +project.addAssets("assets/export_presets/*", { destination: "data/export_presets/{name}" }); +project.addAssets("assets/keymap_presets/*", { destination: "data/keymap_presets/{name}" }); +project.addAssets("assets/licenses/**", { destination: "data/licenses/{name}" }); +project.addAssets("assets/plugins/*", { destination: "data/plugins/{name}" }); +project.addAssets("assets/meshes/*", { destination: "data/meshes/{name}" }); +project.addAssets("assets/readme/readme.txt", { destination: "{name}" }); if (flags.android) { - project.addAssets("Assets/readme/readme_android.txt", { destination: "{name}" }); + project.addAssets("assets/readme/readme_android.txt", { destination: "{name}" }); } else if (flags.ios) { - project.addAssets("Assets/readme/readme_ios.txt", { destination: "{name}" }); + project.addAssets("assets/readme/readme_ios.txt", { destination: "{name}" }); } if (flags.physics) { project.addDefine("arm_physics"); - project.addAssets("Assets/plugins/ammo/*", { destination: "data/plugins/{name}" }); + project.addAssets("assets/plugins/ammo/*", { destination: "data/plugins/{name}" }); } if (flags.raytrace) { if (flags.d3d12) { - project.addAssets("Assets/readme/readme_dxr.txt", { destination: "{name}" }); + project.addAssets("assets/readme/readme_dxr.txt", { destination: "{name}" }); } else if (flags.vulkan) { - project.addAssets("Assets/readme/readme_vkrt.txt", { destination: "{name}" }); + project.addAssets("assets/readme/readme_vkrt.txt", { destination: "{name}" }); } } diff --git a/armorpaint/Shaders/dilate_map.frag.glsl b/armorpaint/shaders/dilate_map.frag.glsl similarity index 100% rename from armorpaint/Shaders/dilate_map.frag.glsl rename to armorpaint/shaders/dilate_map.frag.glsl diff --git a/armorpaint/Shaders/dilate_map.vert.glsl b/armorpaint/shaders/dilate_map.vert.glsl similarity index 100% rename from armorpaint/Shaders/dilate_map.vert.glsl rename to armorpaint/shaders/dilate_map.vert.glsl diff --git a/armorpaint/Shaders/dilate_pass.frag.glsl b/armorpaint/shaders/dilate_pass.frag.glsl similarity index 100% rename from armorpaint/Shaders/dilate_pass.frag.glsl rename to armorpaint/shaders/dilate_pass.frag.glsl diff --git a/armorpaint/Shaders/layer_invert.frag.glsl b/armorpaint/shaders/layer_invert.frag.glsl similarity index 100% rename from armorpaint/Shaders/layer_invert.frag.glsl rename to armorpaint/shaders/layer_invert.frag.glsl diff --git a/armorpaint/Shaders/layer_merge.frag.glsl b/armorpaint/shaders/layer_merge.frag.glsl similarity index 100% rename from armorpaint/Shaders/layer_merge.frag.glsl rename to armorpaint/shaders/layer_merge.frag.glsl diff --git a/armorpaint/Shaders/layer_view.frag.glsl b/armorpaint/shaders/layer_view.frag.glsl similarity index 100% rename from armorpaint/Shaders/layer_view.frag.glsl rename to armorpaint/shaders/layer_view.frag.glsl diff --git a/armorpaint/Shaders/mask_colorid.frag.glsl b/armorpaint/shaders/mask_colorid.frag.glsl similarity index 100% rename from armorpaint/Shaders/mask_colorid.frag.glsl rename to armorpaint/shaders/mask_colorid.frag.glsl diff --git a/armorpaint/Shaders/mask_merge.frag.glsl b/armorpaint/shaders/mask_merge.frag.glsl similarity index 100% rename from armorpaint/Shaders/mask_merge.frag.glsl rename to armorpaint/shaders/mask_merge.frag.glsl diff --git a/armorsculpt/Shaders/mesh_posnor.frag.glsl b/armorpaint/shaders/mesh_posnor.frag.glsl similarity index 93% rename from armorsculpt/Shaders/mesh_posnor.frag.glsl rename to armorpaint/shaders/mesh_posnor.frag.glsl index 5c87cc4d..0a24e7e1 100644 --- a/armorsculpt/Shaders/mesh_posnor.frag.glsl +++ b/armorpaint/shaders/mesh_posnor.frag.glsl @@ -1,6 +1,6 @@ #version 450 -#include "../../base/Shaders/std/gbuffer.glsl" +#include "../../base/shaders/std/gbuffer.glsl" in vec3 wnormal; in vec4 wvpposition; diff --git a/armorpaint/Shaders/mesh_posnor.vert.glsl b/armorpaint/shaders/mesh_posnor.vert.glsl similarity index 100% rename from armorpaint/Shaders/mesh_posnor.vert.glsl rename to armorpaint/shaders/mesh_posnor.vert.glsl diff --git a/armorpaint/Sources/import_folder.ts b/armorpaint/sources/import_folder.ts similarity index 100% rename from armorpaint/Sources/import_folder.ts rename to armorpaint/sources/import_folder.ts diff --git a/armorpaint/Sources/make_bake.ts b/armorpaint/sources/make_bake.ts similarity index 100% rename from armorpaint/Sources/make_bake.ts rename to armorpaint/sources/make_bake.ts diff --git a/armorpaint/Sources/make_blur.ts b/armorpaint/sources/make_blur.ts similarity index 100% rename from armorpaint/Sources/make_blur.ts rename to armorpaint/sources/make_blur.ts diff --git a/armorpaint/Sources/make_brush.ts b/armorpaint/sources/make_brush.ts similarity index 100% rename from armorpaint/Sources/make_brush.ts rename to armorpaint/sources/make_brush.ts diff --git a/armorpaint/Sources/make_clone.ts b/armorpaint/sources/make_clone.ts similarity index 100% rename from armorpaint/Sources/make_clone.ts rename to armorpaint/sources/make_clone.ts diff --git a/armorpaint/Sources/make_colorid_picker.ts b/armorpaint/sources/make_colorid_picker.ts similarity index 100% rename from armorpaint/Sources/make_colorid_picker.ts rename to armorpaint/sources/make_colorid_picker.ts diff --git a/armorpaint/Sources/make_discard.ts b/armorpaint/sources/make_discard.ts similarity index 100% rename from armorpaint/Sources/make_discard.ts rename to armorpaint/sources/make_discard.ts diff --git a/armorpaint/Sources/make_material.ts b/armorpaint/sources/make_material.ts similarity index 100% rename from armorpaint/Sources/make_material.ts rename to armorpaint/sources/make_material.ts diff --git a/armorpaint/Sources/make_mesh.ts b/armorpaint/sources/make_mesh.ts similarity index 100% rename from armorpaint/Sources/make_mesh.ts rename to armorpaint/sources/make_mesh.ts diff --git a/armorpaint/Sources/make_mesh_preview.ts b/armorpaint/sources/make_mesh_preview.ts similarity index 100% rename from armorpaint/Sources/make_mesh_preview.ts rename to armorpaint/sources/make_mesh_preview.ts diff --git a/armorpaint/Sources/make_node_preview.ts b/armorpaint/sources/make_node_preview.ts similarity index 100% rename from armorpaint/Sources/make_node_preview.ts rename to armorpaint/sources/make_node_preview.ts diff --git a/armorpaint/Sources/make_paint.ts b/armorpaint/sources/make_paint.ts similarity index 100% rename from armorpaint/Sources/make_paint.ts rename to armorpaint/sources/make_paint.ts diff --git a/armorpaint/Sources/make_particle.ts b/armorpaint/sources/make_particle.ts similarity index 100% rename from armorpaint/Sources/make_particle.ts rename to armorpaint/sources/make_particle.ts diff --git a/armorpaint/Sources/make_texcoord.ts b/armorpaint/sources/make_texcoord.ts similarity index 100% rename from armorpaint/Sources/make_texcoord.ts rename to armorpaint/sources/make_texcoord.ts diff --git a/armorpaint/Sources/manifest.ts b/armorpaint/sources/manifest.ts similarity index 100% rename from armorpaint/Sources/manifest.ts rename to armorpaint/sources/manifest.ts diff --git a/armorpaint/Sources/nodes/brush_output_node.ts b/armorpaint/sources/nodes/brush_output_node.ts similarity index 100% rename from armorpaint/Sources/nodes/brush_output_node.ts rename to armorpaint/sources/nodes/brush_output_node.ts diff --git a/armorpaint/Sources/nodes/input_node.ts b/armorpaint/sources/nodes/input_node.ts similarity index 100% rename from armorpaint/Sources/nodes/input_node.ts rename to armorpaint/sources/nodes/input_node.ts diff --git a/armorpaint/Sources/nodes/tex_image_node.ts b/armorpaint/sources/nodes/tex_image_node.ts similarity index 100% rename from armorpaint/Sources/nodes/tex_image_node.ts rename to armorpaint/sources/nodes/tex_image_node.ts diff --git a/armorpaint/Sources/nodes_brush.ts b/armorpaint/sources/nodes_brush.ts similarity index 100% rename from armorpaint/Sources/nodes_brush.ts rename to armorpaint/sources/nodes_brush.ts diff --git a/armorpaint/Sources/render_path_paint.ts b/armorpaint/sources/render_path_paint.ts similarity index 100% rename from armorpaint/Sources/render_path_paint.ts rename to armorpaint/sources/render_path_paint.ts diff --git a/armorpaint/Sources/render_path_preview.ts b/armorpaint/sources/render_path_preview.ts similarity index 100% rename from armorpaint/Sources/render_path_preview.ts rename to armorpaint/sources/render_path_preview.ts diff --git a/armorpaint/Sources/slot_brush.ts b/armorpaint/sources/slot_brush.ts similarity index 100% rename from armorpaint/Sources/slot_brush.ts rename to armorpaint/sources/slot_brush.ts diff --git a/armorpaint/Sources/slot_font.ts b/armorpaint/sources/slot_font.ts similarity index 100% rename from armorpaint/Sources/slot_font.ts rename to armorpaint/sources/slot_font.ts diff --git a/armorpaint/Sources/slot_layer.ts b/armorpaint/sources/slot_layer.ts similarity index 100% rename from armorpaint/Sources/slot_layer.ts rename to armorpaint/sources/slot_layer.ts diff --git a/armorpaint/Sources/slot_material.ts b/armorpaint/sources/slot_material.ts similarity index 100% rename from armorpaint/Sources/slot_material.ts rename to armorpaint/sources/slot_material.ts diff --git a/armorpaint/Sources/tab_layers.ts b/armorpaint/sources/tab_layers.ts similarity index 100% rename from armorpaint/Sources/tab_layers.ts rename to armorpaint/sources/tab_layers.ts diff --git a/armorsculpt/Assets/Scene.arm b/armorsculpt/assets/Scene.arm similarity index 100% rename from armorsculpt/Assets/Scene.arm rename to armorsculpt/assets/Scene.arm diff --git a/armorsculpt/Assets/badge.png b/armorsculpt/assets/badge.png similarity index 100% rename from armorsculpt/Assets/badge.png rename to armorsculpt/assets/badge.png diff --git a/armorsculpt/Assets/default_brush.arm b/armorsculpt/assets/default_brush.arm similarity index 100% rename from armorsculpt/Assets/default_brush.arm rename to armorsculpt/assets/default_brush.arm diff --git a/armorsculpt/Assets/default_material.arm b/armorsculpt/assets/default_material.arm similarity index 100% rename from armorsculpt/Assets/default_material.arm rename to armorsculpt/assets/default_material.arm diff --git a/armorsculpt/Assets/keymap_presets/touch.json b/armorsculpt/assets/keymap_presets/touch.json similarity index 100% rename from armorsculpt/Assets/keymap_presets/touch.json rename to armorsculpt/assets/keymap_presets/touch.json diff --git a/armorsculpt/Assets/licenses/license.md b/armorsculpt/assets/licenses/license.md similarity index 100% rename from armorsculpt/Assets/licenses/license.md rename to armorsculpt/assets/licenses/license.md diff --git a/armorsculpt/Assets/licenses/plugins/keepme.txt b/armorsculpt/assets/licenses/plugins/keepme.txt similarity index 100% rename from armorsculpt/Assets/licenses/plugins/keepme.txt rename to armorsculpt/assets/licenses/plugins/keepme.txt diff --git a/armorsculpt/Assets/meshes/keepme.txt b/armorsculpt/assets/meshes/keepme.txt similarity index 100% rename from armorsculpt/Assets/meshes/keepme.txt rename to armorsculpt/assets/meshes/keepme.txt diff --git a/armorsculpt/Assets/plugins/hello_world.js b/armorsculpt/assets/plugins/hello_world.js similarity index 100% rename from armorsculpt/Assets/plugins/hello_world.js rename to armorsculpt/assets/plugins/hello_world.js diff --git a/armorsculpt/Assets/readme/readme.txt b/armorsculpt/assets/readme/readme.txt similarity index 100% rename from armorsculpt/Assets/readme/readme.txt rename to armorsculpt/assets/readme/readme.txt diff --git a/armorsculpt/Assets/readme/readme_android.txt b/armorsculpt/assets/readme/readme_android.txt similarity index 100% rename from armorsculpt/Assets/readme/readme_android.txt rename to armorsculpt/assets/readme/readme_android.txt diff --git a/armorsculpt/Assets/readme/readme_ios.txt b/armorsculpt/assets/readme/readme_ios.txt similarity index 100% rename from armorsculpt/Assets/readme/readme_ios.txt rename to armorsculpt/assets/readme/readme_ios.txt diff --git a/armorsculpt/Plugins/project.js b/armorsculpt/plugins/project.js similarity index 75% rename from armorsculpt/Plugins/project.js rename to armorsculpt/plugins/project.js index 580fc5e5..6e63632f 100644 --- a/armorsculpt/Plugins/project.js +++ b/armorsculpt/plugins/project.js @@ -1,6 +1,6 @@ let project = new Project('plugins'); -project.addFile('Sources/**'); +project.addFile('sources/**'); project.addDefine('WITH_PLUGIN_EMBED'); diff --git a/armorsculpt/Plugins/Sources/plugins.cpp b/armorsculpt/plugins/sources/plugins.cpp similarity index 100% rename from armorsculpt/Plugins/Sources/plugins.cpp rename to armorsculpt/plugins/sources/plugins.cpp diff --git a/armorsculpt/project.js b/armorsculpt/project.js index b53882d7..000ea0bb 100644 --- a/armorsculpt/project.js +++ b/armorsculpt/project.js @@ -8,26 +8,26 @@ project.addDefine("is_sculpt"); project.addProject("../base"); project.addSources("../armorpaint/Sources"); //// -project.addSources("Sources"); -project.addSources("Sources/nodes"); -project.addShaders("Shaders/*.glsl", { embed: flags.embed }); -project.addAssets("Assets/*", { destination: "data/{name}", embed: flags.embed }); -project.addAssets("Assets/keymap_presets/*", { destination: "data/keymap_presets/{name}" }); -project.addAssets("Assets/licenses/**", { destination: "data/licenses/{name}" }); -project.addAssets("Assets/plugins/*", { destination: "data/plugins/{name}" }); -project.addAssets("Assets/meshes/*", { destination: "data/meshes/{name}" }); -project.addAssets("Assets/readme/readme.txt", { destination: "{name}" }); +project.addSources("sources"); +project.addSources("sources/nodes"); +project.addShaders("shaders/*.glsl", { embed: flags.embed }); +project.addAssets("assets/*", { destination: "data/{name}", embed: flags.embed }); +project.addAssets("assets/keymap_presets/*", { destination: "data/keymap_presets/{name}" }); +project.addAssets("assets/licenses/**", { destination: "data/licenses/{name}" }); +project.addAssets("assets/plugins/*", { destination: "data/plugins/{name}" }); +project.addAssets("assets/meshes/*", { destination: "data/meshes/{name}" }); +project.addAssets("assets/readme/readme.txt", { destination: "{name}" }); if (flags.android) { - project.addAssets("Assets/readme/readme_android.txt", { destination: "{name}" }); + project.addAssets("assets/readme/readme_android.txt", { destination: "{name}" }); } else if (flags.ios) { - project.addAssets("Assets/readme/readme_ios.txt", { destination: "{name}" }); + project.addAssets("assets/readme/readme_ios.txt", { destination: "{name}" }); } if (flags.physics) { project.addDefine("arm_physics"); - project.addAssets("Assets/plugins/ammo/*", { destination: "data/plugins/{name}" }); + project.addAssets("assets/plugins/ammo/*", { destination: "data/plugins/{name}" }); } return project; diff --git a/armorsculpt/Shaders/layer_invert.frag.glsl b/armorsculpt/shaders/layer_invert.frag.glsl similarity index 100% rename from armorsculpt/Shaders/layer_invert.frag.glsl rename to armorsculpt/shaders/layer_invert.frag.glsl diff --git a/armorsculpt/Shaders/layer_merge.frag.glsl b/armorsculpt/shaders/layer_merge.frag.glsl similarity index 100% rename from armorsculpt/Shaders/layer_merge.frag.glsl rename to armorsculpt/shaders/layer_merge.frag.glsl diff --git a/armorsculpt/Shaders/layer_view.frag.glsl b/armorsculpt/shaders/layer_view.frag.glsl similarity index 100% rename from armorsculpt/Shaders/layer_view.frag.glsl rename to armorsculpt/shaders/layer_view.frag.glsl diff --git a/armorsculpt/Shaders/mask_merge.frag.glsl b/armorsculpt/shaders/mask_merge.frag.glsl similarity index 100% rename from armorsculpt/Shaders/mask_merge.frag.glsl rename to armorsculpt/shaders/mask_merge.frag.glsl diff --git a/armorpaint/Shaders/mesh_posnor.frag.glsl b/armorsculpt/shaders/mesh_posnor.frag.glsl similarity index 93% rename from armorpaint/Shaders/mesh_posnor.frag.glsl rename to armorsculpt/shaders/mesh_posnor.frag.glsl index 5c87cc4d..0a24e7e1 100644 --- a/armorpaint/Shaders/mesh_posnor.frag.glsl +++ b/armorsculpt/shaders/mesh_posnor.frag.glsl @@ -1,6 +1,6 @@ #version 450 -#include "../../base/Shaders/std/gbuffer.glsl" +#include "../../base/shaders/std/gbuffer.glsl" in vec3 wnormal; in vec4 wvpposition; diff --git a/armorsculpt/Shaders/mesh_posnor.vert.glsl b/armorsculpt/shaders/mesh_posnor.vert.glsl similarity index 100% rename from armorsculpt/Shaders/mesh_posnor.vert.glsl rename to armorsculpt/shaders/mesh_posnor.vert.glsl diff --git a/armorsculpt/Sources/export_obj.ts b/armorsculpt/sources/export_obj.ts similarity index 100% rename from armorsculpt/Sources/export_obj.ts rename to armorsculpt/sources/export_obj.ts diff --git a/armorsculpt/Sources/import_mesh.ts b/armorsculpt/sources/import_mesh.ts similarity index 96% rename from armorsculpt/Sources/import_mesh.ts rename to armorsculpt/sources/import_mesh.ts index ee10894b..4fe158c3 100644 --- a/armorsculpt/Sources/import_mesh.ts +++ b/armorsculpt/sources/import_mesh.ts @@ -44,14 +44,10 @@ function import_mesh_finish_import() { if (project_paint_objects.length > 1) { // Sort by name - array_sort(project_paint_objects, function (a: mesh_object_t, b: mesh_object_t): i32 { - if (a.base.name < b.base.name) { - return -1; - } - else if (a.base.name > b.base.name) { - return 1; - } - return 0; + array_sort(project_paint_objects, function (pa: any_ptr, pb: any_ptr): i32 { + let a: mesh_object_t = DEREFERENCE(pa); + let b: mesh_object_t = DEREFERENCE(pb); + return strcmp(a.base.name, b.base.name); }); // No mask by default diff --git a/armorsculpt/Sources/make_brush.ts b/armorsculpt/sources/make_brush.ts similarity index 100% rename from armorsculpt/Sources/make_brush.ts rename to armorsculpt/sources/make_brush.ts diff --git a/armorsculpt/Sources/make_material.ts b/armorsculpt/sources/make_material.ts similarity index 100% rename from armorsculpt/Sources/make_material.ts rename to armorsculpt/sources/make_material.ts diff --git a/armorsculpt/Sources/make_mesh.ts b/armorsculpt/sources/make_mesh.ts similarity index 100% rename from armorsculpt/Sources/make_mesh.ts rename to armorsculpt/sources/make_mesh.ts diff --git a/armorsculpt/Sources/make_mesh_preview.ts b/armorsculpt/sources/make_mesh_preview.ts similarity index 100% rename from armorsculpt/Sources/make_mesh_preview.ts rename to armorsculpt/sources/make_mesh_preview.ts diff --git a/armorsculpt/Sources/make_sculpt.ts b/armorsculpt/sources/make_sculpt.ts similarity index 100% rename from armorsculpt/Sources/make_sculpt.ts rename to armorsculpt/sources/make_sculpt.ts diff --git a/armorsculpt/Sources/manifest.ts b/armorsculpt/sources/manifest.ts similarity index 100% rename from armorsculpt/Sources/manifest.ts rename to armorsculpt/sources/manifest.ts diff --git a/armorsculpt/Sources/nodes/brush_output_node.ts b/armorsculpt/sources/nodes/brush_output_node.ts similarity index 100% rename from armorsculpt/Sources/nodes/brush_output_node.ts rename to armorsculpt/sources/nodes/brush_output_node.ts diff --git a/armorsculpt/Sources/tab_layers.ts b/armorsculpt/sources/tab_layers.ts similarity index 100% rename from armorsculpt/Sources/tab_layers.ts rename to armorsculpt/sources/tab_layers.ts diff --git a/base/Shaders/voxel_hlsl/voxel_pos.frag.glsl b/base/Shaders/voxel_hlsl/voxel_pos.frag.glsl deleted file mode 100644 index 81ef8494db34a0ba65b40a260d7f7d0f66814611..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 775 zcmbVKPfNmZ7=E3KqEage%8EurSVXk&&>_;=Tt=3$8F=VWnW14UW>m*@3_8}WZr=70 z`T~87u3b9^_Po03@)SMr?EU-v-gm!^0ypMewb3LZwY;TFXJeC}Z@XIh`8GcL`p^m> z|1A)OVbkC{$6x}5W8`%;r#&L}!2RnSgxhUGP=Twfvdp=0Py$on9GCzZM_>r#8Bwqe zz_7dncfq}S#WI`b`L&eN7o>c_C`d-_M5SC=DHe5=9LFg_!@Uf)Mm|?AV1Wbn!HXybUQ$@|V+0Y=;UUqfNI^>!J8_Lj z;C*GHxJBKZkmZt{>62)FLbUHW4d6~9qi%1~wK3QFYl{Q5843lxz71T{7`RF_{N?s( zN&kGp{62*&B45n@8d0pL9r9~!1-th+g-ggTH*)?qlgYf8l=pRQ^7pBlQam#O4GPFIfWXfEr_Q6gBl{& z{*LCxhQ_9rw(NQDL!!9B_wKpp{r>&#eTAOUClaE0-8gFMtk#Gn1q1@wdOCCQe%)<- zd@U~-=6&TQu_hoA^AiQZaUcmt4|o7>d_-zCClhqM)B%{200qCtY`j8Mvy#NVML+~% zKopn-SPpIa_vKzJlk1K~BhF?25J&;8JUU7WjBC-eV~-)Mx?H2SZZrq+%Q%hv>uX}77eWN`PW9q6{C}|~8>oiYVrkF9#dtDuhw7DTsQOlRtk#&nSwTCH#xxQNukZHPE&FMn%zz)uK`+t&pp~!B@daTi~-02?to7d@I7T>lz?4 z9JcIJ#6Cq^=f2pHk2!%2UAg`grw(`6XOf*OM{Kt89G~FiE#Ma;POUuWqv#_y868l7A`__*A6ci+8tFBEDWwXIr{h_v!r_R_hlMBc|AA6~AW z-kxulLf|jLL{a#8pbE5s1QI9U^TqYeNyJ>202DwN(yqnhMBBM?woouMvTeJ79MA#c-C6sIO;g;m@_n0Wo{5qfD|wa^a5;qKm_1(vZe!rbG6v}m$X}l=A1dz ztX52`p{Ud9tdiP2s9VbZaowz0<^-RwxS<&}iD(Ob*T78*(y#q2L!}bYzD(hUEW2@) zNJ1$sV042#PEUHCxig;&W!!SNE(wnBIOgY27ZY5JBVPEefU}OLQ literal 0 HcmV?d00001 diff --git a/base/Shaders/voxel_hlsl/voxel_pos.geom.glsl b/base/shaders/voxel_hlsl/voxel_pos.geom.glsl similarity index 100% rename from base/Shaders/voxel_hlsl/voxel_pos.geom.glsl rename to base/shaders/voxel_hlsl/voxel_pos.geom.glsl diff --git a/base/shaders/voxel_hlsl/voxel_pos.vert.glsl b/base/shaders/voxel_hlsl/voxel_pos.vert.glsl new file mode 100644 index 0000000000000000000000000000000000000000..1b5742784a1b1c2ff5bc110c4ce7f1e135bad987 GIT binary patch literal 2138 zcmb_bO>0v@6rGo^h8mhssJJSRQly0{Mx!Vc8`AXEY?_jkrh-sXUbNECNSmt5;G(P2 zU!W_&O*SrE_yeTB#dQ|CQ_p!bHyK|{Td+6W+&5?LoVoYRjPt5>sFX9i+HCFAoBXUP zS{@#Y6}Jk@r)QH#*V-R{PQQ7ycQQY9-@(jcQmHs%4!#S25C4pb1>mLX>e>Rv%)?N* zaIvWQNT-$BSlL=Gmn%ip?RLu}){vvW2H(}q?e%iCv{5RrsY-FhOCfXf)|Uk}b}%M>0?)(6?3^zK%p*qN-^@51YH0d- zvsG{B-saeU6kW#fqsiX(ny(nV-t+JIw+?sfe&fK+-p<~2=V~wa8}820zTa&4^W>>M zDOTDErPjgn0Yp!6h~B9iP?3Eba`rNrVEh7eJy(BoPiPpyQuP1|_LRoGX&r$jh%rz2 zNFq3U6`VPO^Xvp?j^M0CaOMDyPlBI!Dq;2}He+GreW=u!oyYvmxL#-HdlpAQI2>I+ zIfPf%ej3*tpt}_R@xS;Z|Ig3fw0=5DJ;bPs=wmbv^pQEF1Uj-`!Kk_PON{+8vR_7O z*3XANG-B_BBbEv7F*zhp*8WHjYMe3o=ki0JA^zkQ@<%ln_6W}R!hTWnP(8qSAJ6MI ztdDT;?5Ov3i$io2t$2pafsNGjFMjAlBPRSeuaZBd`@M8M*gISgd*XYhW~2JG>!&`# z!FxkJJc~p66s>rtM6-+d$xD4`+>`vY;}AbF^3%v~EO`6;w$F=Wo9oPQ0q*CAx$J&9 zCvQ#qm3P9t0_NGDyenetlbG-l>j9&A6MBx=fnersO(-=U#v*yH>MRXh_Y=;OeVOg# a`QKRz?@Khm+(9kG9%D(>E8R(QVC)a~T%Lje literal 0 HcmV?d00001 diff --git a/base/Shaders/world_pass.frag.glsl b/base/shaders/world_pass.frag.glsl similarity index 100% rename from base/Shaders/world_pass.frag.glsl rename to base/shaders/world_pass.frag.glsl diff --git a/base/Shaders/world_pass.vert.glsl b/base/shaders/world_pass.vert.glsl similarity index 100% rename from base/Shaders/world_pass.vert.glsl rename to base/shaders/world_pass.vert.glsl diff --git a/base/Sources/args.ts b/base/sources/args.ts similarity index 100% rename from base/Sources/args.ts rename to base/sources/args.ts diff --git a/base/Sources/base.ts b/base/sources/base.ts similarity index 100% rename from base/Sources/base.ts rename to base/sources/base.ts diff --git a/base/Sources/box_export.ts b/base/sources/box_export.ts similarity index 100% rename from base/Sources/box_export.ts rename to base/sources/box_export.ts diff --git a/base/Sources/box_preferences.ts b/base/sources/box_preferences.ts similarity index 100% rename from base/Sources/box_preferences.ts rename to base/sources/box_preferences.ts diff --git a/base/Sources/box_projects.ts b/base/sources/box_projects.ts similarity index 100% rename from base/Sources/box_projects.ts rename to base/sources/box_projects.ts diff --git a/base/Sources/camera.ts b/base/sources/camera.ts similarity index 100% rename from base/Sources/camera.ts rename to base/sources/camera.ts diff --git a/base/Sources/config.ts b/base/sources/config.ts similarity index 100% rename from base/Sources/config.ts rename to base/sources/config.ts diff --git a/base/Sources/console.ts b/base/sources/console.ts similarity index 100% rename from base/Sources/console.ts rename to base/sources/console.ts diff --git a/base/Sources/context.ts b/base/sources/context.ts similarity index 100% rename from base/Sources/context.ts rename to base/sources/context.ts diff --git a/base/Sources/enums.ts b/base/sources/enums.ts similarity index 100% rename from base/Sources/enums.ts rename to base/sources/enums.ts diff --git a/base/Sources/export_arm.ts b/base/sources/export_arm.ts similarity index 100% rename from base/Sources/export_arm.ts rename to base/sources/export_arm.ts diff --git a/base/Sources/export_gpl.ts b/base/sources/export_gpl.ts similarity index 100% rename from base/Sources/export_gpl.ts rename to base/sources/export_gpl.ts diff --git a/base/Sources/export_mesh.ts b/base/sources/export_mesh.ts similarity index 100% rename from base/Sources/export_mesh.ts rename to base/sources/export_mesh.ts diff --git a/base/Sources/export_obj.ts b/base/sources/export_obj.ts similarity index 100% rename from base/Sources/export_obj.ts rename to base/sources/export_obj.ts diff --git a/base/Sources/export_texture.ts b/base/sources/export_texture.ts similarity index 100% rename from base/Sources/export_texture.ts rename to base/sources/export_texture.ts diff --git a/base/Sources/file.ts b/base/sources/file.ts similarity index 100% rename from base/Sources/file.ts rename to base/sources/file.ts diff --git a/base/Sources/geom.ts b/base/sources/geom.ts similarity index 96% rename from base/Sources/geom.ts rename to base/sources/geom.ts index 39d861d7..fd7a9dbd 100644 --- a/base/Sources/geom.ts +++ b/base/sources/geom.ts @@ -130,16 +130,23 @@ function geom_make_uv_sphere(radius: f32 = 1.0, width_segments: i32 = 32, height return mesh; } -type raw_mesh_t = { +declare type raw_mesh_t = { posa?: i16_array_t; nora?: i16_array_t; texa?: i16_array_t; cola?: i16_array_t; inda?: u32_array_t; + vertex_count?: i32; + index_count?: i32; scale_pos?: f32; scale_tex?: f32; name?: string; has_next?: bool; + pos?: u64; + udims?: u32_array_t[]; + udims_count?: u32_array_t; + udims_u?: i32; + udims_v?: i32; vertex_arrays?: vertex_array_t[]; index_arrays?: index_array_t[]; }; diff --git a/base/Sources/gizmo.ts b/base/sources/gizmo.ts similarity index 100% rename from base/Sources/gizmo.ts rename to base/sources/gizmo.ts diff --git a/base/Sources/history.ts b/base/sources/history.ts similarity index 100% rename from base/Sources/history.ts rename to base/sources/history.ts diff --git a/base/Sources/import_arm.ts b/base/sources/import_arm.ts similarity index 100% rename from base/Sources/import_arm.ts rename to base/sources/import_arm.ts diff --git a/base/Sources/import_asset.ts b/base/sources/import_asset.ts similarity index 100% rename from base/Sources/import_asset.ts rename to base/sources/import_asset.ts diff --git a/base/Sources/import_blend_material.ts b/base/sources/import_blend_material.ts similarity index 100% rename from base/Sources/import_blend_material.ts rename to base/sources/import_blend_material.ts diff --git a/base/Sources/import_blend_mesh.ts b/base/sources/import_blend_mesh.ts similarity index 100% rename from base/Sources/import_blend_mesh.ts rename to base/sources/import_blend_mesh.ts diff --git a/base/Sources/import_envmap.ts b/base/sources/import_envmap.ts similarity index 100% rename from base/Sources/import_envmap.ts rename to base/sources/import_envmap.ts diff --git a/base/Sources/import_font.ts b/base/sources/import_font.ts similarity index 100% rename from base/Sources/import_font.ts rename to base/sources/import_font.ts diff --git a/base/Sources/import_gpl.ts b/base/sources/import_gpl.ts similarity index 100% rename from base/Sources/import_gpl.ts rename to base/sources/import_gpl.ts diff --git a/base/Sources/import_keymap.ts b/base/sources/import_keymap.ts similarity index 100% rename from base/Sources/import_keymap.ts rename to base/sources/import_keymap.ts diff --git a/base/Sources/import_mesh.ts b/base/sources/import_mesh.ts similarity index 96% rename from base/Sources/import_mesh.ts rename to base/sources/import_mesh.ts index 7df1412c..917e12d6 100644 --- a/base/Sources/import_mesh.ts +++ b/base/sources/import_mesh.ts @@ -70,14 +70,10 @@ function import_mesh_finish_import() { if (project_paint_objects.length > 1) { // Sort by name - array_sort(project_paint_objects, function (a: mesh_object_t, b: mesh_object_t): i32 { - if (a.base.name < b.base.name) { - return -1; - } - else if (a.base.name > b.base.name) { - return 1; - } - return 0; + array_sort(project_paint_objects, function (pa: any_ptr, pb: any_ptr): i32 { + let a: mesh_object_t = DEREFERENCE(pa); + let b: mesh_object_t = DEREFERENCE(pb); + return strcmp(a.base.name, b.base.name); }); // No mask by default @@ -261,7 +257,7 @@ function import_mesh_add_mesh(mesh: raw_mesh_t) { } function import_mesh_raw_mesh(mesh: raw_mesh_t): mesh_data_t { - let raw: raw_mesh_t = { + let raw: mesh_data_t = { name: mesh.name, vertex_arrays: [ { diff --git a/base/Sources/import_obj.ts b/base/sources/import_obj.ts similarity index 91% rename from base/Sources/import_obj.ts rename to base/sources/import_obj.ts index abbc4238..450b6e9a 100644 --- a/base/Sources/import_obj.ts +++ b/base/sources/import_obj.ts @@ -1,22 +1,4 @@ -declare type obj_part_t = { - posa: i16_array_t; - nora: i16_array_t; - texa: i16_array_t; - inda: u32_array_t; - vertex_count: i32; - index_count: i32; - scale_pos: f32; - scale_tex: f32; - name: string; - has_next: bool; - pos: i32; - udims: u32_array_t[]; - udims_count: u32_array_t; - udims_u: i32; - udims_v: i32; -}; - function import_obj_run(path: string, replace_existing: bool = true) { let i: split_type_t = context_raw.split_by; let is_udim: bool = i == split_type_t.UDIM; @@ -28,7 +10,7 @@ function import_obj_run(path: string, replace_existing: bool = true) { let b: buffer_t = data_get_blob(path); if (is_udim) { - // let part: obj_part_t = krom_io_obj_parse(b, split_code, 0, is_udim); + // let part: raw_mesh_t = krom_io_obj_parse(b, split_code, 0, is_udim); // let name: string = part.name; // for (let i: i32 = 0; i < part.udims.length; ++i) { // if (part.udims[i].length == 0) { @@ -42,8 +24,8 @@ function import_obj_run(path: string, replace_existing: bool = true) { // } } else { - let parts: obj_part_t[] = []; - let part: obj_part_t = krom_io_obj_parse(b, split_code, 0, false); + let parts: raw_mesh_t[] = []; + let part: raw_mesh_t = krom_io_obj_parse(b, split_code, 0, false); array_push(parts, part); while (part.has_next) { part = krom_io_obj_parse(b, split_code, part.pos, false); diff --git a/base/Sources/import_plugin.ts b/base/sources/import_plugin.ts similarity index 100% rename from base/Sources/import_plugin.ts rename to base/sources/import_plugin.ts diff --git a/base/Sources/import_texture.ts b/base/sources/import_texture.ts similarity index 100% rename from base/Sources/import_texture.ts rename to base/sources/import_texture.ts diff --git a/base/Sources/import_theme.ts b/base/sources/import_theme.ts similarity index 100% rename from base/Sources/import_theme.ts rename to base/sources/import_theme.ts diff --git a/base/Sources/line_draw.ts b/base/sources/line_draw.ts similarity index 100% rename from base/Sources/line_draw.ts rename to base/sources/line_draw.ts diff --git a/base/Sources/logic_node.ts b/base/sources/logic_node.ts similarity index 100% rename from base/Sources/logic_node.ts rename to base/sources/logic_node.ts diff --git a/base/Sources/main.ts b/base/sources/main.ts similarity index 100% rename from base/Sources/main.ts rename to base/sources/main.ts diff --git a/base/Sources/make_voxel.ts b/base/sources/make_voxel.ts similarity index 100% rename from base/Sources/make_voxel.ts rename to base/sources/make_voxel.ts diff --git a/base/Sources/node_shader.ts b/base/sources/node_shader.ts similarity index 95% rename from base/Sources/node_shader.ts rename to base/sources/node_shader.ts index 3c91bbcb..d102f49e 100644 --- a/base/Sources/node_shader.ts +++ b/base/sources/node_shader.ts @@ -241,9 +241,11 @@ function node_shader_get_hlsl(raw: node_shader_t, shared_sampler: string): strin if (raw.ins.length > 0) { s += "struct SPIRV_Cross_Input {\n"; index = 0; - array_sort(raw.ins, function (stra: string, strb: string): i32 { + array_sort(raw.ins, function (pa: any_ptr, pb: any_ptr): i32 { + let stra: string = DEREFERENCE(pa); + let strb: string = DEREFERENCE(pb); // Sort inputs by name - return substring(stra, 4, stra.length) >= substring(strb, 4, strb.length) ? 1 : -1; + return strcmp(substring(stra, 4, stra.length), substring(strb, 4, strb.length)); }); for (let i: i32 = 0; i < raw.ins.length; ++i) { let a: string = raw.ins[i]; @@ -266,9 +268,11 @@ function node_shader_get_hlsl(raw: node_shader_t, shared_sampler: string): strin let num: i32 = 0; if (raw.outs.length > 0 || raw.shader_type == "vert") { s += "struct SPIRV_Cross_Output {\n"; - array_sort(raw.outs, function (stra: string, strb: string): i32 { + array_sort(raw.outs, function (pa: any_ptr, pb: any_ptr): i32 { + let stra: string = DEREFERENCE(pa); + let strb: string = DEREFERENCE(pb); // Sort outputs by name - return substring(stra, 4, stra.length) >= substring(strb, 4, strb.length) ? 1 : -1; + return strcmp(substring(stra, 4, stra.length), substring(strb, 4, strb.length)); }); index = 0; if (raw.shader_type == "vert") { @@ -440,9 +444,11 @@ function node_shader_get_msl(raw: node_shader_t, shared_sampler: string): string //if (ins.length > 0) { s += "struct main_in {\n"; index = 0; - array_sort(raw.ins, function (stra: string, strb: string): i32 { + array_sort(raw.ins, function (pa: any_ptr, pb: any_ptr): i32 { + let stra: string = DEREFERENCE(pa); + let strb: string = DEREFERENCE(pb); // Sort inputs by name - return substring(stra, 4, stra.length) >= substring(strb, 4, strb.length) ? 1 : -1; + return strcmp(substring(stra, 4, stra.length), substring(strb, 4, strb.length)); }); if (raw.shader_type == "vert") { for (let i: i32 = 0; i < raw.ins.length; ++i) { @@ -465,9 +471,11 @@ function node_shader_get_msl(raw: node_shader_t, shared_sampler: string): string let num: i32 = 0; if (raw.outs.length > 0 || raw.shader_type == "vert") { s += "struct main_out {\n"; - array_sort(raw.outs, function (stra: string, strb: string): i32 { + array_sort(raw.outs, function (pa: any_ptr, pb: any_ptr): i32 { + let stra: string = DEREFERENCE(pa); + let strb: string = DEREFERENCE(pb); // Sort outputs by name - return substring(stra, 4, stra.length) >= substring(strb, 4, strb.length) ? 1 : -1; + return strcmp(substring(stra, 4, stra.length), substring(strb, 4, strb.length)); }); index = 0; if (raw.shader_type == "vert") { diff --git a/base/Sources/node_shader_context.ts b/base/sources/node_shader_context.ts similarity index 100% rename from base/Sources/node_shader_context.ts rename to base/sources/node_shader_context.ts diff --git a/base/Sources/nodes/boolean_node.ts b/base/sources/nodes/boolean_node.ts similarity index 100% rename from base/Sources/nodes/boolean_node.ts rename to base/sources/nodes/boolean_node.ts diff --git a/base/Sources/nodes/color_node.ts b/base/sources/nodes/color_node.ts similarity index 100% rename from base/Sources/nodes/color_node.ts rename to base/sources/nodes/color_node.ts diff --git a/base/Sources/nodes/float_node.ts b/base/sources/nodes/float_node.ts similarity index 100% rename from base/Sources/nodes/float_node.ts rename to base/sources/nodes/float_node.ts diff --git a/base/Sources/nodes/integer_node.ts b/base/sources/nodes/integer_node.ts similarity index 100% rename from base/Sources/nodes/integer_node.ts rename to base/sources/nodes/integer_node.ts diff --git a/base/Sources/nodes/math_node.ts b/base/sources/nodes/math_node.ts similarity index 100% rename from base/Sources/nodes/math_node.ts rename to base/sources/nodes/math_node.ts diff --git a/base/Sources/nodes/null_node.ts b/base/sources/nodes/null_node.ts similarity index 100% rename from base/Sources/nodes/null_node.ts rename to base/sources/nodes/null_node.ts diff --git a/base/Sources/nodes/random_node.ts b/base/sources/nodes/random_node.ts similarity index 100% rename from base/Sources/nodes/random_node.ts rename to base/sources/nodes/random_node.ts diff --git a/base/Sources/nodes/separate_vector_node.ts b/base/sources/nodes/separate_vector_node.ts similarity index 100% rename from base/Sources/nodes/separate_vector_node.ts rename to base/sources/nodes/separate_vector_node.ts diff --git a/base/Sources/nodes/string_node.ts b/base/sources/nodes/string_node.ts similarity index 100% rename from base/Sources/nodes/string_node.ts rename to base/sources/nodes/string_node.ts diff --git a/base/Sources/nodes/time_node.ts b/base/sources/nodes/time_node.ts similarity index 100% rename from base/Sources/nodes/time_node.ts rename to base/sources/nodes/time_node.ts diff --git a/base/Sources/nodes/vector_math_node.ts b/base/sources/nodes/vector_math_node.ts similarity index 100% rename from base/Sources/nodes/vector_math_node.ts rename to base/sources/nodes/vector_math_node.ts diff --git a/base/Sources/nodes/vector_node.ts b/base/sources/nodes/vector_node.ts similarity index 100% rename from base/Sources/nodes/vector_node.ts rename to base/sources/nodes/vector_node.ts diff --git a/base/Sources/nodes_material.ts b/base/sources/nodes_material.ts similarity index 100% rename from base/Sources/nodes_material.ts rename to base/sources/nodes_material.ts diff --git a/base/Sources/operator.ts b/base/sources/operator.ts similarity index 100% rename from base/Sources/operator.ts rename to base/sources/operator.ts diff --git a/base/Sources/parser_blend.ts b/base/sources/parser_blend.ts similarity index 100% rename from base/Sources/parser_blend.ts rename to base/sources/parser_blend.ts diff --git a/base/Sources/parser_exr.ts b/base/sources/parser_exr.ts similarity index 100% rename from base/Sources/parser_exr.ts rename to base/sources/parser_exr.ts diff --git a/base/Sources/parser_logic.ts b/base/sources/parser_logic.ts similarity index 100% rename from base/Sources/parser_logic.ts rename to base/sources/parser_logic.ts diff --git a/base/Sources/parser_material.ts b/base/sources/parser_material.ts similarity index 100% rename from base/Sources/parser_material.ts rename to base/sources/parser_material.ts diff --git a/base/Sources/path.ts b/base/sources/path.ts similarity index 97% rename from base/Sources/path.ts rename to base/sources/path.ts index 133538ac..998d4dbf 100644 --- a/base/Sources/path.ts +++ b/base/sources/path.ts @@ -83,7 +83,8 @@ function path_working_dir(): string { } save += "working_dir.txt"; krom_sys_command(cmd + " > \"" + save + "\""); - path_working_dir_cache = trim_end(sys_buffer_to_string(krom_load_blob(save))); + path_working_dir_cache = sys_buffer_to_string(krom_load_blob(save)); + path_working_dir_cache = trim_end(path_working_dir_cache); } return path_working_dir_cache; } diff --git a/base/Sources/physics_body.ts b/base/sources/physics_body.ts similarity index 100% rename from base/Sources/physics_body.ts rename to base/sources/physics_body.ts diff --git a/base/Sources/physics_bullet.ts b/base/sources/physics_bullet.ts similarity index 100% rename from base/Sources/physics_bullet.ts rename to base/sources/physics_bullet.ts diff --git a/base/Sources/physics_world.ts b/base/sources/physics_world.ts similarity index 100% rename from base/Sources/physics_world.ts rename to base/sources/physics_world.ts diff --git a/base/Sources/plugin.ts b/base/sources/plugin.ts similarity index 100% rename from base/Sources/plugin.ts rename to base/sources/plugin.ts diff --git a/base/Sources/project.ts b/base/sources/project.ts similarity index 100% rename from base/Sources/project.ts rename to base/sources/project.ts diff --git a/base/Sources/render_path_base.ts b/base/sources/render_path_base.ts similarity index 100% rename from base/Sources/render_path_base.ts rename to base/sources/render_path_base.ts diff --git a/base/Sources/render_path_deferred.ts b/base/sources/render_path_deferred.ts similarity index 100% rename from base/Sources/render_path_deferred.ts rename to base/sources/render_path_deferred.ts diff --git a/base/Sources/render_path_forward.ts b/base/sources/render_path_forward.ts similarity index 100% rename from base/Sources/render_path_forward.ts rename to base/sources/render_path_forward.ts diff --git a/base/Sources/render_path_raytrace.ts b/base/sources/render_path_raytrace.ts similarity index 100% rename from base/Sources/render_path_raytrace.ts rename to base/sources/render_path_raytrace.ts diff --git a/base/Sources/render_path_raytrace_bake.ts b/base/sources/render_path_raytrace_bake.ts similarity index 100% rename from base/Sources/render_path_raytrace_bake.ts rename to base/sources/render_path_raytrace_bake.ts diff --git a/base/Sources/resource.ts b/base/sources/resource.ts similarity index 100% rename from base/Sources/resource.ts rename to base/sources/resource.ts diff --git a/base/Sources/strings.ts b/base/sources/strings.ts similarity index 100% rename from base/Sources/strings.ts rename to base/sources/strings.ts diff --git a/base/Sources/tab_browser.ts b/base/sources/tab_browser.ts similarity index 100% rename from base/Sources/tab_browser.ts rename to base/sources/tab_browser.ts diff --git a/base/Sources/tab_brushes.ts b/base/sources/tab_brushes.ts similarity index 100% rename from base/Sources/tab_brushes.ts rename to base/sources/tab_brushes.ts diff --git a/base/Sources/tab_console.ts b/base/sources/tab_console.ts similarity index 100% rename from base/Sources/tab_console.ts rename to base/sources/tab_console.ts diff --git a/base/Sources/tab_fonts.ts b/base/sources/tab_fonts.ts similarity index 100% rename from base/Sources/tab_fonts.ts rename to base/sources/tab_fonts.ts diff --git a/base/Sources/tab_history.ts b/base/sources/tab_history.ts similarity index 100% rename from base/Sources/tab_history.ts rename to base/sources/tab_history.ts diff --git a/base/Sources/tab_materials.ts b/base/sources/tab_materials.ts similarity index 100% rename from base/Sources/tab_materials.ts rename to base/sources/tab_materials.ts diff --git a/base/Sources/tab_meshes.ts b/base/sources/tab_meshes.ts similarity index 100% rename from base/Sources/tab_meshes.ts rename to base/sources/tab_meshes.ts diff --git a/base/Sources/tab_particles.ts b/base/sources/tab_particles.ts similarity index 100% rename from base/Sources/tab_particles.ts rename to base/sources/tab_particles.ts diff --git a/base/Sources/tab_plugins.ts b/base/sources/tab_plugins.ts similarity index 100% rename from base/Sources/tab_plugins.ts rename to base/sources/tab_plugins.ts diff --git a/base/Sources/tab_script.ts b/base/sources/tab_script.ts similarity index 100% rename from base/Sources/tab_script.ts rename to base/sources/tab_script.ts diff --git a/base/Sources/tab_swatches.ts b/base/sources/tab_swatches.ts similarity index 100% rename from base/Sources/tab_swatches.ts rename to base/sources/tab_swatches.ts diff --git a/base/Sources/tab_textures.ts b/base/sources/tab_textures.ts similarity index 100% rename from base/Sources/tab_textures.ts rename to base/sources/tab_textures.ts diff --git a/base/Sources/translator.ts b/base/sources/translator.ts similarity index 97% rename from base/Sources/translator.ts rename to base/sources/translator.ts index 2886f7dd..143869c4 100644 --- a/base/Sources/translator.ts +++ b/base/sources/translator.ts @@ -140,7 +140,9 @@ let _translator_init_font_font_path: string; let _translator_init_font_font_scale: f32; function translator_init_font(cjk: bool, font_path: string, font_scale: f32) { - array_sort(_g2_font_glyphs, function (a: i32, b: i32): i32 { + array_sort(_g2_font_glyphs, function (pa: any_ptr, pb: any_ptr): i32 { + let a: i32 = (i32)DEREFERENCE(pa); + let b: i32 = (i32)DEREFERENCE(pb); return a - b; }); diff --git a/base/Sources/ui_base.ts b/base/sources/ui_base.ts similarity index 100% rename from base/Sources/ui_base.ts rename to base/sources/ui_base.ts diff --git a/base/Sources/ui_box.ts b/base/sources/ui_box.ts similarity index 100% rename from base/Sources/ui_box.ts rename to base/sources/ui_box.ts diff --git a/base/Sources/ui_files.ts b/base/sources/ui_files.ts similarity index 100% rename from base/Sources/ui_files.ts rename to base/sources/ui_files.ts diff --git a/base/Sources/ui_header.ts b/base/sources/ui_header.ts similarity index 100% rename from base/Sources/ui_header.ts rename to base/sources/ui_header.ts diff --git a/base/Sources/ui_menu.ts b/base/sources/ui_menu.ts similarity index 100% rename from base/Sources/ui_menu.ts rename to base/sources/ui_menu.ts diff --git a/base/Sources/ui_menubar.ts b/base/sources/ui_menubar.ts similarity index 100% rename from base/Sources/ui_menubar.ts rename to base/sources/ui_menubar.ts diff --git a/base/Sources/ui_nodes.ts b/base/sources/ui_nodes.ts similarity index 100% rename from base/Sources/ui_nodes.ts rename to base/sources/ui_nodes.ts diff --git a/base/Sources/ui_status.ts b/base/sources/ui_status.ts similarity index 100% rename from base/Sources/ui_status.ts rename to base/sources/ui_status.ts diff --git a/base/Sources/ui_toolbar.ts b/base/sources/ui_toolbar.ts similarity index 100% rename from base/Sources/ui_toolbar.ts rename to base/sources/ui_toolbar.ts diff --git a/base/Sources/ui_view2d.ts b/base/sources/ui_view2d.ts similarity index 100% rename from base/Sources/ui_view2d.ts rename to base/sources/ui_view2d.ts diff --git a/base/Sources/uniforms_ext.ts b/base/sources/uniforms_ext.ts similarity index 100% rename from base/Sources/uniforms_ext.ts rename to base/sources/uniforms_ext.ts diff --git a/base/Sources/util_mesh.ts b/base/sources/util_mesh.ts similarity index 97% rename from base/Sources/util_mesh.ts rename to base/sources/util_mesh.ts index 2c74e4bd..fabd0984 100644 --- a/base/Sources/util_mesh.ts +++ b/base/sources/util_mesh.ts @@ -48,11 +48,12 @@ function util_mesh_merge(paint_objects: mesh_object_t[] = null) { ///end // Re-scale - for (let j: i32 = 0; j < math_floor(va0.length / 4); ++j) { - va0[j * 4 + voff * 4] = math_floor((va0[j * 4 + voff * 4] * scale) / max_scale); - va0[j * 4 + 1 + voff * 4] = math_floor((va0[j * 4 + 1 + voff * 4] * scale) / max_scale); - va0[j * 4 + 2 + voff * 4] = math_floor((va0[j * 4 + 2 + voff * 4] * scale) / max_scale); + for (let j: i32 = voff; j < math_floor(va0.length / 4); ++j) { + va0[j * 4 ] = math_floor((va0[j * 4 ] * scale) / max_scale); + va0[j * 4 + 1] = math_floor((va0[j * 4 + 1] * scale) / max_scale); + va0[j * 4 + 2] = math_floor((va0[j * 4 + 2] * scale) / max_scale); } + // Nor for (let j: i32 = 0; j < vas[1].values.length; ++j) { va1[j + voff * 2] = vas[1].values[j]; @@ -62,8 +63,10 @@ function util_mesh_merge(paint_objects: mesh_object_t[] = null) { va2[j + voff * 2] = vas[2].values[j]; } // Col - if (va3 != null) for (let j: i32 = 0; j < vas[3].values.length; ++j) { - va3[j + voff * 4] = vas[3].values[j]; + if (va3 != null) { + for (let j: i32 = 0; j < vas[3].values.length; ++j) { + va3[j + voff * 4] = vas[3].values[j]; + } } // Indices for (let j: i32 = 0; j < ias[0].values.length; ++j) { diff --git a/base/Sources/util_particle.ts b/base/sources/util_particle.ts similarity index 100% rename from base/Sources/util_particle.ts rename to base/sources/util_particle.ts diff --git a/base/Sources/util_render.ts b/base/sources/util_render.ts similarity index 100% rename from base/Sources/util_render.ts rename to base/sources/util_render.ts diff --git a/base/Sources/util_uv.ts b/base/sources/util_uv.ts similarity index 100% rename from base/Sources/util_uv.ts rename to base/sources/util_uv.ts diff --git a/base/Sources/viewport.ts b/base/sources/viewport.ts similarity index 100% rename from base/Sources/viewport.ts rename to base/sources/viewport.ts diff --git a/base/Tools/extract_locales.js b/base/tools/extract_locales.js similarity index 100% rename from base/Tools/extract_locales.js rename to base/tools/extract_locales.js diff --git a/misc/pad/project.js b/misc/pad/project.js index aa977216..d02f09f6 100644 --- a/misc/pad/project.js +++ b/misc/pad/project.js @@ -13,9 +13,9 @@ flags.on_c_project_created = function(c_project) { let project = new Project("ArmorPad"); let root = "../../"; -project.addSources("Sources"); +project.addSources("sources"); project.addShaders(root + "armorcore/shaders/*.glsl",); -project.addAssets(root + "base/Assets/font_mono.ttf", { destination: "data/{name}" }); -project.addAssets(root + "base/Assets/text_coloring.json", { destination: "data/{name}" }); +project.addAssets(root + "base/assets/font_mono.ttf", { destination: "data/{name}" }); +project.addAssets(root + "base/assets/text_coloring.json", { destination: "data/{name}" }); return project; diff --git a/misc/pad/Sources/main.ts b/misc/pad/sources/main.ts similarity index 100% rename from misc/pad/Sources/main.ts rename to misc/pad/sources/main.ts