Update projects.

V-Sekai · May 11, 2024 · 8f05e32 · 8f05e32
1 parent 959074a
commit 8f05e32
Show file tree

Hide file tree

Showing 6 changed files with 57 additions and 57 deletions.
diff --git a/README.md b/README.md
@@ -1,57 +1,57 @@
-# V-Sekai Model Explorer
+# V-Sekai Model Explorer
 <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
 [![All Contributors](https://img.shields.io/badge/all_contributors-3-orange.svg?style=flat-square)](#contributors-)
 <!-- ALL-CONTRIBUTORS-BADGE:END -->
-
-> :warning: **Warning**: This tool uses a custom fork of Godot for 4.3 FBX import. Please check the releases section for more details. [Releases Section](https://github.com/V-Sekai/TOOL_model_explorer/releases)
-
-V-Sekai Model Explorer is a 3D model viewer built with Godot 4. It supports various model formats like VRM and glTF 2.0. With this tool, you can dive deep into the components of a 3D model - inspecting meshes, materials, textures, and animations. It comes packed with features such as detailed viewing, animation playback, interactive controls, and a double-click action for an up-close examination. You also have the option to hide the grid or explode the meshes. So, it's a pretty handy tool if you're looking to explore 3D models in detail.
-
-<div style="width: 50%; margin: auto; overflow: hidden;">
-    <img src=".github/Screenshot 2023-09-21 105018.png" alt="Model Explorer Image">
-</div>
-
-## Release notes
-
-`.fbx`, `.vrm`, `.glb`, and `.gltf` files can be viewed.
-
-## Features
-
-- View gltf 2.0 models
-- Show meshes inside
-- Show materials inside
-  - View material properties
-- Show textures inside
-  - Quick view texture
-- Show animations inside
-  - Quick play animation
-- Toggle wireframe mode
-
-## Special Thanks to AllenDang
-
-Thanks to AllenDang for creating the original version.
-
-[AllenDang's Model Explorer](https://github.com/AllenDang/model_explorer_godot4)
-## Contributors ✨
-
-Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/docs/en/emoji-key)):
-
+
+> :warning: **Warning**: This tool uses a custom fork of Godot for 4.3 FBX import. Please check the releases section for more details. [Releases Section](https://github.com/V-Sekai/TOOL_model_explorer/releases)
+
+V-Sekai Model Explorer is a 3D model viewer built with Godot 4. It supports various model formats like VRM and glTF 2.0. With this tool, you can dive deep into the components of a 3D model - inspecting meshes, materials, textures, and animations. It comes packed with features such as detailed viewing, animation playback, interactive controls, and a double-click action for an up-close examination. You also have the option to hide the grid or explode the meshes. So, it's a pretty handy tool if you're looking to explore 3D models in detail.
+
+<div style="width: 50%; margin: auto; overflow: hidden;">
+	<img src=".github/Screenshot 2023-09-21 105018.png" alt="Model Explorer Image">
+</div>
+
+## Release notes
+
+`.fbx`, `.vrm`, `.glb`, and `.gltf` files can be viewed.
+
+## Features
+
+- View gltf 2.0 models
+- Show meshes inside
+- Show materials inside
+  - View material properties
+- Show textures inside
+  - Quick view texture
+- Show animations inside
+  - Quick play animation
+- Toggle wireframe mode
+
+## Special Thanks to AllenDang
+
+Thanks to AllenDang for creating the original version.
+
+[AllenDang's Model Explorer](https://github.com/AllenDang/model_explorer_godot4)
+## Contributors ✨
+
+Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/docs/en/emoji-key)):
+
 <!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
 <!-- prettier-ignore-start -->
 <!-- markdownlint-disable -->
 <table>
   <tbody>
-    <tr>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Illauriel"><img src="https://avatars.githubusercontent.com/u/10573379?v=4?s=100" width="100px;" alt="Illauriel"/><br /><sub><b>Illauriel</b></sub></a><br /><a href="#ideas-Illauriel" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://github.com/V-Sekai/TOOL_model_explorer/commits?author=Illauriel" title="Code">💻</a> <a href="https://github.com/V-Sekai/TOOL_model_explorer/commits?author=Illauriel" title="Tests">⚠️</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://chibifire.com"><img src="https://avatars.githubusercontent.com/u/32321?v=4?s=100" width="100px;" alt="K. S. Ernest (iFire) Lee"/><br /><sub><b>K. S. Ernest (iFire) Lee</b></sub></a><br /><a href="#ideas-fire" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://github.com/V-Sekai/TOOL_model_explorer/commits?author=fire" title="Code">💻</a> <a href="#infra-fire" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/AllenDang"><img src="https://avatars.githubusercontent.com/u/18550?v=4?s=100" width="100px;" alt="Allen Dang"/><br /><sub><b>Allen Dang</b></sub></a><br /><a href="https://github.com/V-Sekai/TOOL_model_explorer/commits?author=AllenDang" title="Code">💻</a></td>
-    </tr>
+	<tr>
+	  <td align="center" valign="top" width="14.28%"><a href="https://github.com/Illauriel"><img src="https://avatars.githubusercontent.com/u/10573379?v=4?s=100" width="100px;" alt="Illauriel"/><br /><sub><b>Illauriel</b></sub></a><br /><a href="#ideas-Illauriel" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://github.com/V-Sekai/TOOL_model_explorer/commits?author=Illauriel" title="Code">💻</a> <a href="https://github.com/V-Sekai/TOOL_model_explorer/commits?author=Illauriel" title="Tests">⚠️</a></td>
+	  <td align="center" valign="top" width="14.28%"><a href="https://chibifire.com"><img src="https://avatars.githubusercontent.com/u/32321?v=4?s=100" width="100px;" alt="K. S. Ernest (iFire) Lee"/><br /><sub><b>K. S. Ernest (iFire) Lee</b></sub></a><br /><a href="#ideas-fire" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://github.com/V-Sekai/TOOL_model_explorer/commits?author=fire" title="Code">💻</a> <a href="#infra-fire" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a></td>
+	  <td align="center" valign="top" width="14.28%"><a href="https://github.com/AllenDang"><img src="https://avatars.githubusercontent.com/u/18550?v=4?s=100" width="100px;" alt="Allen Dang"/><br /><sub><b>Allen Dang</b></sub></a><br /><a href="https://github.com/V-Sekai/TOOL_model_explorer/commits?author=AllenDang" title="Code">💻</a></td>
+	</tr>
   </tbody>
 </table>
 
 <!-- markdownlint-restore -->
 <!-- prettier-ignore-end -->
 
-<!-- ALL-CONTRIBUTORS-LIST:END -->
-
-This project follows the [all-contributors](https://github.com/all-contributors/all-contributors) specification. Contributions of any kind welcome!
+<!-- ALL-CONTRIBUTORS-LIST:END -->
+
+This project follows the [all-contributors](https://github.com/all-contributors/all-contributors) specification. Contributions of any kind welcome!
diff --git a/project.godot b/project.godot
@@ -42,22 +42,22 @@ theme/default_font_generate_mipmaps=true
 
 toggle_wireframe={
 "deadzone": 0.5,
-"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":87,"key_label":0,"unicode":0,"echo":false,"script":null)
+"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":87,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null)
 ]
 }
 close_popup={
 "deadzone": 0.5,
-"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194305,"key_label":0,"unicode":0,"echo":false,"script":null)
+"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194305,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null)
 ]
 }
 explode_meshes={
 "deadzone": 0.5,
-"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":69,"key_label":0,"unicode":0,"echo":false,"script":null)
+"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":69,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null)
 ]
 }
 toggle_grid={
 "deadzone": 0.5,
-"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":71,"key_label":0,"unicode":0,"echo":false,"script":null)
+"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":71,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null)
 ]
 }
 

diff --git a/vsk_model_explorer/core/MeshExt.gd b/vsk_model_explorer/core/MeshExt.gd
@@ -4,7 +4,7 @@ var _outline_material: ShaderMaterial
 
 func _ready():
 	_outline_material = ShaderMaterial.new()
-	_outline_material.shader = preload("res://vsk_model_explorer/shader/Outlint.gdshader")
+	_outline_material.shader = preload("res://vsk_model_explorer/shader/Outline.gdshader")
 
 # Created and optimized by https://github.com/fire
 # Huge thank!

diff --git a/vsk_model_explorer/core/UIController.gd b/vsk_model_explorer/core/UIController.gd
@@ -460,7 +460,7 @@ func _on_animation_item_finished(animation_name : StringName, player : Animation
 
 
 func _show_texture_viewer(tex):
-	if texViewer != null and not texViewer.is_queued_for_deletion():
+	if texViewer and not texViewer.is_queued_for_deletion():
 		texViewer.queue_free()
 
 	texViewer = TextureViewer.instantiate()

diff --git a/vsk_model_explorer/scene/ModelExplorer.tscn b/vsk_model_explorer/scene/ModelExplorer.tscn
@@ -189,7 +189,7 @@ theme_override_constants/margin_bottom = 16
 [node name="Label" type="Label" parent="Node/MessagePanel/MarginContainer"]
 layout_mode = 2
 theme_override_font_sizes/font_size = 48
-text = "Drop gltf/glb/vrm/fbx file into this window"
+text = "Drop 3d model into this window"
 
 [connection signal="fbx_is_loaded" from="." to="CamController" method="_on_root_gltf_is_loaded"]
 [connection signal="fbx_is_loaded" from="." to="Node" method="_on_root_gltf_is_loaded"]

diff --git a/vsk_model_explorer/shader/Outlint.gdshader → vsk_model_explorer/shader/Outline.gdshader b/vsk_model_explorer/shader/Outlint.gdshader → vsk_model_explorer/shader/Outline.gdshader
@@ -1,7 +1,7 @@
-shader_type spatial;
-
-render_mode unshaded, cull_back;
-
-void fragment() {
-	EMISSION = vec3(1., 1., 0.);
-}
+shader_type spatial;
+
+render_mode unshaded, cull_back;
+
+void fragment() {
+	EMISSION = vec3(1., 1., 0.);
+}