Skip to content

Commit

Permalink
MacOS preset and fix to rescale pedestal when loading from hard drive
Browse files Browse the repository at this point in the history
  • Loading branch information
@michaelt919
michaelt919 committed Apr 8, 2024
1 parent cff3cd9 commit 91b3d8f
Show file tree
Hide file tree
Showing 2 changed files with 117 additions and 5 deletions.
110 changes: 108 additions & 2 deletions export_presets.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@ debug/export_console_script=1

name="Windows Desktop (with environments)"
platform="Windows Desktop"
runnable=true
runnable=false
dedicated_server=false
custom_features=""
export_filter="all_resources"
Expand Down Expand Up @@ -375,7 +375,7 @@ Remove-Item -Recurse -Force '{temp_dir}'"

name="Windows Desktop (single environment)"
platform="Windows Desktop"
runnable=false
runnable=true
dedicated_server=false
custom_features=""
export_filter="exclude"
Expand Down Expand Up @@ -474,3 +474,109 @@ progressive_web_app/icon_144x144=""
progressive_web_app/icon_180x180=""
progressive_web_app/icon_512x512=""
progressive_web_app/background_color=Color(0, 0, 0, 1)

[preset.6]

name="macOS (single environment)"
platform="macOS"
runnable=true
dedicated_server=false
custom_features=""
export_filter="exclude"
export_files=PackedStringArray("res://assets/Environments/Ceiling/Environment_CeilingSquares_DarkBrownWood.glb", "res://assets/Environments/Ceiling/Environment_CeilingSquares_DarkBrownWood_Wood_Ceiling_Coffers_002_basecolor.jpg", "res://assets/Environments/Ceiling/Environment_CeilingSquares_DarkBrownWood_Wood_Ceiling_Coffers_002_normal.jpg", "res://assets/Environments/Ceiling/Environment_CeilingSquares_DarkBrownWood_Wood_Ceiling_Coffers_002_roughness.png", "res://assets/Environments/Ceiling/Environment_CeilingSquares_White.glb", "res://assets/Environments/Ceiling/Environment_CeilingSquares_White_Ceiling_Drop_Tiles_001_basecolor.jpg", "res://assets/Environments/Ceiling/Environment_CeilingSquares_White_Ceiling_Drop_Tiles_001_normal.jpg", "res://assets/Environments/Ceiling/Environment_CeilingSquares_White_Ceiling_Drop_Tiles_001_roughness.png", "res://assets/Environments/Ceiling/Environment_MarbleDome_White.glb", "res://assets/Environments/Ceiling/Environment_MarbleDome_White_Stone_Column_001_basecolor.jpg", "res://assets/Environments/Ceiling/Environment_MarbleLoopCeiling_White.glb", "res://assets/Environments/Ceiling/Environment_MarbleLoopCeiling_White_Stone_Column_001_basecolor.jpg", "res://assets/Environments/Floor/Environment_CementFloor_Tan.glb", "res://assets/Environments/Floor/Environment_CementFloor_Tan_scuffed_cement_diff_4k.jpg", "res://assets/Environments/Floor/Environment_CementFloor_Tan_scuffed_cement_nor_gl_4k.png", "res://assets/Environments/Floor/Environment_CementFloor_Tan_scuffed_cement_rough_4k.png", "res://assets/Environments/Floor/Environment_ClassicalFloor_Dark.glb", "res://assets/Environments/Floor/Environment_ClassicalFloor_Dark_4K-enrico_speranza-diffuse.jpg", "res://assets/Environments/Floor/Environment_ClassicalFloor_Dark_4K-enrico_speranza-normal.jpg", "res://assets/Environments/Floor/Environment_ClassicalFloor_Dark_4K-wallpaper_5-diffuse.jpg", "res://assets/Environments/Floor/Environment_ClassicalFloor_Dark_4K-wallpaper_5-displacement.jpg", "res://assets/Environments/Floor/Environment_ClassicalFloor_Dark_Marble_Gray_002_roughness.png", "res://assets/Environments/Floor/Environment_ConcreteFloor_LightGrey.glb", "res://assets/Environments/Floor/Environment_ConcreteFloor_LightGrey_Concrete_010_COLOR.jpg", "res://assets/Environments/Floor/Environment_PlainEnteranceWall_Tan.glb", "res://assets/Environments/Floor/Environment_PlainEnteranceWall_Tan_4K-teak_wood-normal.jpg", "res://assets/Environments/Floor/Environment_RoundFloor_Checkered.glb", "res://assets/Environments/Floor/Environment_RoundFloor_Checkered_floor_tiles_06_diff_4k.jpg", "res://assets/Environments/Floor/Environment_RoundFloor_Checkered_floor_tiles_06_nor_gl_4k.png", "res://assets/Environments/Floor/Environment_RoundFloor_Checkered_floor_tiles_06_rough_4k.png", "res://assets/Environments/Floor/Environment_RoundFloor_Checkered_Stone_Column_001_basecolor.jpg", "res://assets/Environments/Floor/Environment_TileFloor_Green.glb", "res://assets/Environments/Floor/Environment_TileFloor_Green_stone_tiles_diff_4k.jpg", "res://assets/Environments/Floor/Environment_TileFloor_Green_stone_tiles_nor_gl_4k.png", "res://assets/Environments/Floor/Environment_TileFloor_Green_stone_tiles_rough_4k.png", "res://assets/Environments/Floor/Environment_TileFloor_Tan.glb", "res://assets/Environments/Floor/Environment_TileFloor_Tan_Stone_Tiles_004_basecolor.jpg", "res://assets/Environments/Floor/Environment_TileFloor_Tan_Stone_Tiles_004_normal.jpg", "res://assets/Environments/Floor/Environment_TileFloor_Tan_Stone_Tiles_004_roughness.png", "res://assets/Environments/Floor/Environment_WallpaperEnteranceWall_Green.glb", "res://assets/Environments/Floor/Environment_WallpaperEnteranceWall_Green_4K-walllpaper_16-ao - Copy.jpg", "res://assets/Environments/Floor/Environment_WallpaperEnteranceWall_Green_4K-walllpaper_16-normal.jpg", "res://assets/Environments/Floor/Environment_WallpaperEnteranceWall_Green_wood_table_001_diff_4k_lessSat.jpg", "res://assets/Environments/Floor/Environment_WallpaperEnteranceWall_Green_wood_table_001_rough_4k.png", "res://assets/Environments/Floor/Environment_WallpaperWall_Green.glb", "res://assets/Environments/Floor/Environment_WallpaperWall_Green_4K-walllpaper_16-ao - Copy.jpg", "res://assets/Environments/Floor/Environment_WallpaperWall_Green_4K-walllpaper_16-normal.jpg", "res://assets/Environments/Floor/Environment_WallpaperWall_Green_wood_table_001_diff_4k_lessSat.jpg", "res://assets/Environments/Floor/Environment_WallpaperWall_Green_wood_table_001_rough_4k.png", "res://scenes/environments/tan_tile_room.tscn", "res://scenes/environments/Tan_Room.tscn", "res://scenes/environments/round_classical_room_Environment.tscn", "res://scenes/environments/round_black_room_Environment.tscn", "res://assets/Environments/HDRIs/industrial_sunset_puresky_4k.exr", "res://assets/Environments/HDRIs/rooitou_park_4k.exr", "res://assets/Environments/HDRIs/sunny_vondelpark_4k.exr", "res://scenes/environments/Green_Square_Room.tscn", "res://scenes/environments/WhiteGalleryRoom.tscn", "res://scenes/environments/circular_tan_room.tscn", "res://scenes/environments/ClassicalEnvironment.tscn", "res://scenes/environments/worn_brick_room.tscn", "res://assets/Environments/Objects/BlankFrames/Object_BlankFrame_LightBlue.glb", "res://assets/Environments/Objects/BlankFrames/Object_BlankFrame_Tan.glb", "res://assets/Environments/Objects/Columns/Object_ClassicCollumn_White.glb", "res://assets/Environments/Objects/Columns/Object_ClassicCollumn_White_Stone_Column_001_basecolor.jpg", "res://assets/Environments/Objects/Columns/Object_ClassicCollumn_White_Stone_Column_001_normal.jpg", "res://assets/Environments/Objects/Columns/Object_ClassicColumn_White.glb", "res://assets/Environments/Objects/Columns/Object_ClassicColumn_White_Stone_Column_001_basecolor.jpg", "res://assets/Environments/Objects/Columns/Object_ClassicColumn_White_Stone_Column_001_normal.jpg", "res://assets/Environments/Objects/Columns/Object_Pedestal_Marble.glb", "res://assets/Environments/Objects/Columns/Object_Pedestal_Marble_Stone_Column_001_basecolor.jpg", "res://assets/Environments/Objects/Pedestals/Classic/Object_Pedestal_DarkWoodClassic.glb", "res://assets/Environments/Objects/Pedestals/Classic/Object_Pedestal_DarkWoodClassic_wood_table_001_diff_4k.png", "res://assets/Environments/Objects/Pedestals/Classic/Object_Pedestal_DarkWoodClassic_wood_table_001_diff_4k_lessSat.jpg", "res://assets/Environments/Objects/Pedestals/Classic/Object_Pedestal_DarkWoodClassic_wood_table_001_rough_4k.png", "res://assets/Environments/Objects/Pedestals/Modern1/Object_Pedestal_BlackModern1.glb", "res://scenes/environments/PhotoStudioWhite.tscn", "res://scenes/environments/PhotoStudioBlack.tscn", "res://scenes/environments/green_tile_room.tscn", "res://scenes/environments/green_tile_pillar_room.tscn", "res://assets/Environments/Objects/Pedestals/Modern2/Object_Pedestal_TanModern2.glb", "res://assets/Environments/Objects/Pedestals/Modern2/Object_Pedestal_TanModern2_scuffed_cement_diff_4k3.jpg", "res://assets/Environments/Objects/Pedestals/Plain/Object_Pedestal_BlackPlain.glb", "res://assets/Environments/Objects/Pedestals/Plain/Object_Pedestal_WhitePlain.glb", "res://assets/Environments/Objects/Pedestals/Plain/Object_Pedestal_WhitePlain_diffuse.png", "res://assets/Environments/Objects/Pedestals/Plain/Object_Pedestal_WhitePlain_normal.png", "res://assets/Environments/Objects/Pedestals/Plain/Object_Pedestal_WhitePlain_roughness.png", "res://assets/Environments/Objects/Pedestals/Object_Pedestal_BlackRoundModern.glb", "res://assets/Environments/Objects/Pedestals/Object_Pedestal_ReddishRock.glb", "res://assets/Environments/Objects/Pedestals/Object_Pedestal_ReddishRock_rock_05_diff_4k.jpg", "res://assets/Environments/Objects/Pedestals/Object_Pedestal_ReddishRock_rock_05_disp_4k.png", "res://assets/Environments/PhotoStudio/Bowls/Environment_PhotoStudio_BlackBowl.glb", "res://assets/Environments/PhotoStudio/Bowls/Environment_PhotoStudio_WhiteBowl.glb", "res://assets/Environments/Walls/Environment_ClassicalWalls_Marbleglb.glb", "res://assets/Environments/Walls/Environment_ClassicalWalls_Marbleglb_Stone_Column_001_basecolor.jpg", "res://assets/Environments/Walls/Environment_ClassicalWalls_Marbleglb_Stone_Column_001_roughness.png", "res://assets/Environments/Walls/Environment_ClassicalWalls_White.glb", "res://assets/Environments/Walls/Environment_ClassicalWalls_WhiteBrick.glb", "res://assets/Environments/Walls/Environment_ClassicalWalls_WhiteBrick_4K-enrico_speranza-diffuse.jpg", "res://assets/Environments/Walls/Environment_ClassicalWalls_WhiteBrick_4K-enrico_speranza-normal.jpg", "res://assets/Environments/Walls/Environment_ClassicalWalls_WhiteBrick_Stone_Column_001_basecolor.jpg", "res://assets/Environments/Walls/Environment_ClassicalWalls_White_4K-enrico_speranza-diffuse.jpg", "res://assets/Environments/Walls/Environment_ClassicalWalls_White_4K-enrico_speranza-normal.jpg", "res://assets/Environments/Walls/Environment_ClassicalWalls_White_Stone_Column_001_basecolor.jpg", "res://assets/Environments/Walls/Environment_MarbleLoop_White.glb", "res://assets/Environments/Walls/Environment_MarbleLoop_White_Stone_Column_001_basecolor.jpg", "res://assets/Environments/Walls/Environment_MarbleWall_White.glb", "res://assets/Environments/Walls/Environment_MarbleWall_White_Stone_Column_001_basecolor.jpg", "res://assets/Environments/Walls/Environment_WallpaperWall_Green_wood_table_001_diff_4k.png", "res://assets/Environments/Walls/Environment_WallpaperWall_Green_wood_table_001_diff_4k_lessSat.jpg", "res://assets/Environments/Walls/Environment_WallpaperWall_Green_wood_table_001_rough_4k.png", "res://scenes/environments/test_environment.tscn", "res://assets/Environments/Walls/Environment_PlainEnteranceWall_Tan.glb", "res://assets/Environments/Walls/Environment_WallpaperEnteranceWall_Green_wood_table_001_diff_4k_lessSat.jpg", "res://assets/Environments/Walls/Environment_WallpaperEnteranceWall_Green_wood_table_001_rough_4k.png", "res://assets/Environments/Walls/Environment_WallpaperWall_Green.glb", "res://assets/Environments/Walls/Environment_WallpaperWall_Green_4K-walllpaper_16-ao - Copy.jpg", "res://assets/Environments/Walls/Environment_PlainWall_Tan.glb", "res://assets/Environments/Walls/Environment_PlainWall_Tan_4K-teak_wood-normal.png", "res://assets/Environments/Walls/Environment_PlainWall_Tan_scuffed_cement_nor_gl_4k.png", "res://assets/Environments/Walls/Environment_PlainWall_Tan_scuffed_cement_rough_4k.png", "res://assets/Environments/Walls/Environment_PlainWall_White.glb", "res://assets/Environments/Walls/Environment_PlainWall_White_4K-teak_wood-normal.png", "res://assets/Environments/Walls/Environment_PlainWall_White_Concrete_010_COLOR.png", "res://assets/Environments/Walls/Environment_PlainWall_White_diffuse.png", "res://assets/Environments/Walls/Environment_PlainWall_White_normal.png", "res://assets/Environments/Walls/Environment_PlainWall_White_roughness.png", "res://assets/Environments/Walls/Environment_RoundEnteranceWall_Black.glb", "res://assets/Environments/Walls/Environment_RoundWall_Black.glb", "res://assets/Environments/Walls/Environment_StoneWall_WornGrey.glb", "res://assets/Environments/Walls/Environment_StoneWall_WornGrey_Wall_Stone_020_basecolor.jpg", "res://assets/Environments/Walls/Environment_StoneWall_WornGrey_Wall_Stone_020_normal.jpg", "res://assets/Environments/Walls/Environment_StoneWall_WornGrey_Wall_Stone_020_roughness.png", "res://assets/Environments/Walls/Environment_TileWall_Tan.glb", "res://assets/Environments/Walls/Environment_TileWall_Tan_diffuse.png", "res://assets/Environments/Walls/Environment_TileWall_Tan_floor_tiles_02_diff_4k.jpg", "res://assets/Environments/Walls/Environment_TileWall_Tan_floor_tiles_02_nor_gl_4k.png", "res://assets/Environments/Walls/Environment_TileWall_Tan_floor_tiles_02_rough_4k.png", "res://assets/Environments/Walls/Environment_TileWall_Tan_normal.png", "res://assets/Environments/Walls/Environment_TileWall_Tan_roughness.png", "res://assets/Environments/Walls/Environment_TileWall_Tan_Stone_Column_001_basecolor.png", "res://assets/Environments/Walls/Environment_TileWall_Tan_Stone_Column_001_normal.png", "res://assets/Environments/Walls/Environment_TileWall_WavyGrey.glb", "res://assets/Environments/Walls/Environment_TileWall_WavyGrey_4K-kitchentiling_3_basecolor.jpg", "res://assets/Environments/Walls/Environment_TileWall_WavyGrey_4K-kitchentiling_3_normal.jpg", "res://assets/Environments/Walls/Environment_TileWall_WavyGrey_4K-kitchentiling_3_roughness.png", "res://assets/Environments/Walls/Environment_WallpaperEnteranceWall_Green.glb", "res://assets/Environments/Walls/Environment_WallpaperEnteranceWall_Green_4K-walllpaper_16-ao - Copy.jpg", "res://assets/Environments/Walls/Environment_WallpaperEnteranceWall_Green_4K-walllpaper_16-normal.png", "res://assets/Environments/Walls/Environment_WallpaperEnteranceWall_Green_wood_table_001_diff_4k.png")
include_filter=""
exclude_filter=""
export_path="export/Kintsugi3DViewer-macos.zip"
encryption_include_filters=""
encryption_exclude_filters=""
encrypt_pck=false
encrypt_directory=false

[preset.6.options]

export/distribution_type=1
binary_format/architecture="universal"
custom_template/debug=""
custom_template/release=""
debug/export_console_wrapper=1
application/icon="res://assets/Logo SVGs/Logo V1/LogoV1_Transparent.svg"
application/icon_interpolation=4
application/bundle_identifier="edu.stout.Kintsugi3D.Builder"
application/signature=""
application/app_category="Education"
application/short_version=""
application/version=""
application/copyright="Copyright (c) 2023 Michael Tetzlaff, Tyler Betanski, Jacob Buelow, Victor Mondragon, Isabel SmithLicensed under GPLv3( http://www.gnu.org/licenses/gpl-3.0.html )This code is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.This code is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details."
application/copyright_localized={}
application/min_macos_version="10.12"
application/export_angle=0
display/high_res=true
xcode/platform_build="14C18"
xcode/sdk_version="13.1"
xcode/sdk_build="22C55"
xcode/sdk_name="macosx13.1"
xcode/xcode_version="1420"
xcode/xcode_build="14C18"
codesign/codesign=1
codesign/installer_identity=""
codesign/apple_team_id=""
codesign/identity=""
codesign/entitlements/custom_file=""
codesign/entitlements/allow_jit_code_execution=false
codesign/entitlements/allow_unsigned_executable_memory=false
codesign/entitlements/allow_dyld_environment_variables=false
codesign/entitlements/disable_library_validation=false
codesign/entitlements/audio_input=false
codesign/entitlements/camera=false
codesign/entitlements/location=false
codesign/entitlements/address_book=false
codesign/entitlements/calendars=false
codesign/entitlements/photos_library=false
codesign/entitlements/apple_events=false
codesign/entitlements/debugging=false
codesign/entitlements/app_sandbox/enabled=false
codesign/entitlements/app_sandbox/network_server=false
codesign/entitlements/app_sandbox/network_client=false
codesign/entitlements/app_sandbox/device_usb=false
codesign/entitlements/app_sandbox/device_bluetooth=false
codesign/entitlements/app_sandbox/files_downloads=0
codesign/entitlements/app_sandbox/files_pictures=0
codesign/entitlements/app_sandbox/files_music=0
codesign/entitlements/app_sandbox/files_movies=0
codesign/entitlements/app_sandbox/files_user_selected=0
codesign/entitlements/app_sandbox/helper_executables=[]
codesign/custom_options=PackedStringArray()
notarization/notarization=0
privacy/microphone_usage_description=""
privacy/microphone_usage_description_localized={}
privacy/camera_usage_description=""
privacy/camera_usage_description_localized={}
privacy/location_usage_description=""
privacy/location_usage_description_localized={}
privacy/address_book_usage_description=""
privacy/address_book_usage_description_localized={}
privacy/calendar_usage_description=""
privacy/calendar_usage_description_localized={}
privacy/photos_library_usage_description=""
privacy/photos_library_usage_description_localized={}
privacy/desktop_folder_usage_description=""
privacy/desktop_folder_usage_description_localized={}
privacy/documents_folder_usage_description=""
privacy/documents_folder_usage_description_localized={}
privacy/downloads_folder_usage_description=""
privacy/downloads_folder_usage_description_localized={}
privacy/network_volumes_usage_description=""
privacy/network_volumes_usage_description_localized={}
privacy/removable_volumes_usage_description=""
privacy/removable_volumes_usage_description_localized={}
ssh_remote_deploy/enabled=false
ssh_remote_deploy/host="user@host_ip"
ssh_remote_deploy/port="22"
ssh_remote_deploy/extra_args_ssh=""
ssh_remote_deploy/extra_args_scp=""
ssh_remote_deploy/run_script="#!/usr/bin/env bash
unzip -o -q \"{temp_dir}/{archive_name}\" -d \"{temp_dir}\"
open \"{temp_dir}/{exe_name}.app\" --args {cmd_args}"
ssh_remote_deploy/cleanup_script="#!/usr/bin/env bash
kill $(pgrep -x -f \"{temp_dir}/{exe_name}.app/Contents/MacOS/{exe_name} {cmd_args}\")
rm -rf \"{temp_dir}\""
12 changes: 9 additions & 3 deletions scripts/artifacts_controller.gd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,8 @@ func _ready():
#print(OS.get_cmdline_args())

var args = OS.get_cmdline_args()
for arg in args:
_open_artifact_through_file(arg)
#$"../new_ui_root/CenterContainer/Label".text += "\n" + arg
_open_artifact_through_file(args[0])
#$"../new_ui_root/CenterContainer/Label".text += "\n" + arg

#_open_artifact_through_file("C:\\Users\\BetanskiTyler\\test_directory\\guan-yu\\model.glb")

Expand Down Expand Up @@ -202,4 +201,11 @@ func _open_artifact_through_file(gltf_file_path : String):

var model = LocalGltfModel.create(data)
add_child(model)

model.preview_load_completed.connect(_on_model_preview_load_complete)
model.load_completed.connect(_on_model_load_complete)
model.load_progress.connect(_on_model_load_progress)

loaded_artifact = model # set here to prevent null pointer dereference
model.load_artifact()

0 comments on commit 91b3d8f

Please sign in to comment.