feat: nft shape & open nft dialog #93

kuruk-mm · 2023-11-14T01:45:17Z

Implements

NFT Shape
Open NFT Dialog
Fix: Now when the cursor is not captured, it doesn't triggers events in the World (UI issue)
Fix: The crosshair shows/hide correctly when the mouse gets captured/released
Add /reload command (it changes to the realm that you are)

codecov-commenter · 2023-11-14T01:54:49Z

Codecov Report

Attention: 148 lines in your changes are missing coverage. Please review.

Comparison is base (c79f288) 13.98% compared to head (4e082f6) 13.84%.

Files	Patch %	Lines
...godot-lib/src/scene_runner/components/nft_shape.rs	0.00%	46 Missing ⚠️
...cene_runner/rpc_calls/handle_restricted_actions.rs	0.00%	37 Missing ⚠️
...entraland-godot-lib/src/godot_classes/dcl_ether.rs	6.45%	29 Missing ⚠️
...traland-godot-lib/src/dcl/js/restricted_actions.rs	0.00%	17 Missing ⚠️
...t/decentraland-godot-lib/src/scene_runner/input.rs	0.00%	8 Missing ⚠️
...raland-godot-lib/src/scene_runner/rpc_calls/mod.rs	0.00%	4 Missing ⚠️
...t/decentraland-godot-lib/src/scene_runner/scene.rs	0.00%	3 Missing ⚠️
...rc/scene_runner/components/avatar_modifier_area.rs	0.00%	2 Missing ⚠️
...traland-godot-lib/src/scene_runner/update_scene.rs	0.00%	2 Missing ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##             main      #93      +/-   ##
==========================================
- Coverage   13.98%   13.84%   -0.14%     
==========================================
  Files         102      104       +2     
  Lines       12227    12365     +138     
==========================================
+ Hits         1710     1712       +2     
- Misses      10517    10653     +136

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

feat: thread loading nft loading image

leanmendoza

It looks all good, just a few comments:

Why reimport all the assets? I see UI/emotes/empty-parcels stuff
Could we move ERC/Ether/bigNumber things to Rust? We already have these kinds of things there and we can reuse them

godot/src/utils/erc20.gd

godot/src/utils/Ether.gd

godot/src/ui/dialogs/nft_dialog.tscn

leanmendoza · 2023-11-16T11:33:17Z

godot/src/ui/explorer.gd

@@ -289,6 +289,8 @@ func _on_line_edit_command_submit_message(message: String):
 				"[color=#ccc]> Trying to change to realm " + params[1] + "[/color]"
 			)
 			Global.realm.set_realm(params[1])
+		elif command_str == "/reload":


godot/src/test/fetcher/opensea_fetch_3d.gd

leanmendoza · 2023-11-16T11:36:32Z

godot/src/test/animated_material/animated_material.gdshader

@@ -0,0 +1,32 @@
+// Shader by Polysthetic (https://youtu.be/-c38gFbGO6U)


what does this material (and the scene) do? can you put some description?

That shader was added without intention.
Anyway, the scene it's useful, at least for me. I renamed the scene to godot_animated_material, so basically, it's using a MeshInstance3D with a ShaderMaterial, and its texture is sprite sheet that is being animated (using UV and you have FPS, ROWS, COLS parameters in the shader).

It's more an example than a test... should I remove it? 🤔

godot/src/logic/content/content_thread_pool.gd

godot/src/decentraland_components/nft_shape.tscn

godot/src/decentraland_components/nft_shape.gd

leanmendoza · 2023-11-16T11:45:15Z

godot/.godot/global_script_class_cache.cfg

+"class": &"Math",
+"icon": "",
+"language": &"GDScript",
+"path": "res://src/utils/Math.gd"


Suggested change

"path": "res://src/utils/Math.gd"

is src/utils/Math.gd in the project?

I'm still seeing this class, maybe a Godot bug?

leanmendoza

take a look at comments before merging but LGTM (and previous ones also)

add some pr desciption

leanmendoza · 2023-11-17T12:32:51Z

godot/.godot/global_script_class_cache.cfg

+"class": &"Math",
+"icon": "",
+"language": &"GDScript",
+"path": "res://src/utils/Math.gd"


I'm still seeing this class, maybe a Godot bug?

leanmendoza · 2023-11-17T12:36:15Z

godot/src/global.gd

@@ -91,3 +94,11 @@ func print_node_tree(node: Node, prefix = ""):

 func _process(_dt: float):
 	http_requester.poll()
+
+
+func capture_mouse():


Suggested change

func capture_mouse():

# TODO: check this if there is a better approach for this

# e.g. when the test-runner runs, explorer node doesn't exist (and it shouldn't)

func capture_mouse():

add this todo comment or similar, good enough for now

now I see the explorer implementation, it could be

Suggested change

func capture_mouse():

func capture_mouse():

var explorer = get_node_or_null("/root/explorer")

if is_instance_valid(explorer):

explorer.capture_mouse()

else:

Input.set_mouse_mode(Input.MOUSE_MODE_CAPTURED)

leanmendoza · 2023-11-17T12:39:42Z

godot/src/ui/dialogs/nft_dialog.tscn

+[node name="VBoxContainer2" type="VBoxContainer" parent="MainVContainer/BodyHContainer/InformationPanel/HBoxContainer"]
+layout_mode = 2
+
+[node name="LabelAvgPrice" type="Label" parent="MainVContainer/BodyHContainer/InformationPanel/HBoxContainer/VBoxContainer2"]


Suggested change

[node name="LabelAvgPrice" type="Label" parent="MainVContainer/BodyHContainer/InformationPanel/HBoxContainer/VBoxContainer2"]

[node name="LabelAvgPrice" type="Label" parent="VBoxContainer_Main/HBoxContainer_Body/Panel_Information/HBoxContainer/VBoxContainer_Some?"]

don't do it if you don't want now, but the convention I was following is NodeType_Name => Button_Exit, Label_Info, Panel_TestWindow, etc

kuruk-mm force-pushed the feat/nft-shape branch 4 times, most recently from 6e4d650 to 8a78888 Compare November 14, 2023 01:49

add fetch for nfts

6b035a1

kuruk-mm force-pushed the feat/nft-shape branch from 8a78888 to dabcca3 Compare November 14, 2023 19:00

nftshapes

4f74c90

kuruk-mm force-pushed the feat/nft-shape branch from dabcca3 to 4f74c90 Compare November 14, 2023 19:28

kuruk-mm added 4 commits November 14, 2023 22:19

feat: working nft shapes

43fcc9c

nft dialog (wip)

cf47eff

Merge remote-tracking branch 'origin/main' into feat/nft-shape

a5a4bfe

fix

2a5754d

kuruk-mm force-pushed the feat/nft-shape branch from 49b6c5e to 2a5754d Compare November 15, 2023 15:44

kuruk-mm added 4 commits November 15, 2023 18:44

feat: nft shape loading animation

a6dd458

feat: thread loading nft loading image

format

6fddbcb

feat: nft dialog working

4b2ce43

add rpc for scenes, final fixes and format

6b6fbba

kuruk-mm marked this pull request as ready for review November 16, 2023 02:44

leanmendoza requested changes Nov 16, 2023

View reviewed changes

kuruk-mm added 3 commits November 16, 2023 09:45

feedback part 1

146db5e

feedback part 2

18ea211

feedback part 3, restore md5 from main

6b30565

kuruk-mm requested a review from leanmendoza November 16, 2023 19:26

feat: scale nft shape to mantain aspect ratio

8818b79

kuruk-mm force-pushed the feat/nft-shape branch from e74c2ce to 8818b79 Compare November 16, 2023 19:38

leanmendoza approved these changes Nov 17, 2023

View reviewed changes

kuruk-mm added 3 commits November 17, 2023 09:51

Merge remote-tracking branch 'origin/main' into feat/nft-shape

17b50db

remove math

4432b78

apply feedback, rename ui nodes, check explorer node

4e082f6

kuruk-mm changed the title ~~feat: nft shape~~ feat: nft shape & open nft dialog Nov 17, 2023

kuruk-mm merged commit 0b96b73 into main Nov 17, 2023
3 checks passed

kuruk-mm deleted the feat/nft-shape branch November 17, 2023 13:25

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: nft shape & open nft dialog #93

feat: nft shape & open nft dialog #93

kuruk-mm commented Nov 14, 2023 •

edited

Loading

codecov-commenter commented Nov 14, 2023 •

edited

Loading

leanmendoza left a comment

leanmendoza Nov 16, 2023

leanmendoza Nov 16, 2023

kuruk-mm Nov 16, 2023 •

edited

Loading

leanmendoza Nov 16, 2023

leanmendoza Nov 17, 2023

leanmendoza left a comment •

edited by kuruk-mm

Loading

leanmendoza Nov 17, 2023

leanmendoza Nov 17, 2023

leanmendoza Nov 17, 2023

leanmendoza Nov 17, 2023

		@@ -0,0 +1,32 @@
		// Shader by Polysthetic (https://youtu.be/-c38gFbGO6U)

-func capture_mouse():
+func capture_mouse():
+  var explorer = get_node_or_null("/root/explorer")
+  if is_instance_valid(explorer):
+     explorer.capture_mouse()
+  else:
+	Input.set_mouse_mode(Input.MOUSE_MODE_CAPTURED)

	[node name="LabelAvgPrice" type="Label" parent="MainVContainer/BodyHContainer/InformationPanel/HBoxContainer/VBoxContainer2"]
	[node name="LabelAvgPrice" type="Label" parent="VBoxContainer_Main/HBoxContainer_Body/Panel_Information/HBoxContainer/VBoxContainer_Some?"]

feat: nft shape & open nft dialog #93

feat: nft shape & open nft dialog #93

Conversation

kuruk-mm commented Nov 14, 2023 • edited Loading

codecov-commenter commented Nov 14, 2023 • edited Loading

Codecov Report

leanmendoza left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

kuruk-mm Nov 16, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

leanmendoza left a comment • edited by kuruk-mm Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

kuruk-mm commented Nov 14, 2023 •

edited

Loading

codecov-commenter commented Nov 14, 2023 •

edited

Loading

kuruk-mm Nov 16, 2023 •

edited

Loading

leanmendoza left a comment •

edited by kuruk-mm

Loading