birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' into hultonha_LYN-2772_whitebox-atom

Browse Source
This commit is contained in:
hultonha
2021-04-26 13:46:34 +01:00
parent c49be543b9 92199d9f2e
commit eabd5c1511
4406 changed files with 29346 additions and 43537 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/WhiteBox/Assets/editor/icons/components/WhiteBox.svg
+1 -1
View File
@@ -13,4 +13,4 @@
<polygon id="Path-Copy-13" points="13.7671372 6.95665174 20.2670168 9.83072189 20.2670168 11.1874622 18.8384453 11.9660025 18.8384453 10.5820615 13.7361408 8.37348836 9.08474184 10.4526917 9.08474184 12.1167079 13.6297133 14.2223402 20.2670168 11.1874622 20.2670168 12.7590024 13.6297133 15.7107886 7.33745898 12.7061276 7.33745898 9.83072189"></polygon>
</g>
</g>
</svg>
</svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

Gems/WhiteBox/Assets/editor/icons/components/WhiteBox_collider.svg
+1 -1
View File
@@ -16,4 +16,4 @@
<polygon id="Path-70" fill-rule="nonzero" transform="translate(17.502016, 7.895715) rotate(7.000000) translate(-17.502016, -7.895715) " points="16.3235972 6.61844483 17.757074 6.1766936 18.6804342 9.17298496 17.2469574 9.61473619"></polygon>
</g>
</g>
</svg>
</svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 3.1 KiB

Gems/WhiteBox/Editor/Scripts/Cylinder.py
+1 -1
View File
@@ -87,4 +87,4 @@ if __name__ == "__main__":
create_cylinder(whiteBoxMesh, args.sides, args.size)
# update whiteBoxMesh
init.update_white_box(whiteBoxMesh, whiteBoxMeshComponent)
init.update_white_box(whiteBoxMesh, whiteBoxMeshComponent)
Gems/WhiteBox/Editor/Scripts/Icosahedron.py
+1 -1
View File
@@ -110,4 +110,4 @@ if __name__ == "__main__":
create_icosahedron(whiteBoxMesh, args.radius)
# update whiteBoxMesh
init.update_white_box(whiteBoxMesh, whiteBoxMeshComponent)
init.update_white_box(whiteBoxMesh, whiteBoxMeshComponent)
Gems/WhiteBox/Editor/Scripts/Sphere.py
+1 -1
View File
@@ -95,4 +95,4 @@ if __name__ == "__main__":
create_sphere(whiteBoxMesh, args.subdivisions, args.radius)
# update whiteBoxMesh
init.update_white_box(whiteBoxMesh, whiteBoxMeshComponent)
init.update_white_box(whiteBoxMesh, whiteBoxMeshComponent)
Gems/WhiteBox/Editor/Scripts/Staircase.py
+1 -1
View File
@@ -100,4 +100,4 @@ if __name__ == "__main__":
create_staircase_from_white_box_mesh(whiteBoxMesh, args.num_steps, args.depth, args.height, args.width)
# update whiteBoxMesh
init.update_white_box(whiteBoxMesh, whiteBoxMeshComponent)
init.update_white_box(whiteBoxMesh, whiteBoxMeshComponent)
Gems/WhiteBox/Editor/Scripts/Tetrahedron.py
+1 -1
View File
@@ -67,4 +67,4 @@ if __name__ == "__main__":
create_tetrahedron(whiteBoxMesh, args.radius)
# update whiteBoxMesh
init.update_white_box(whiteBoxMesh, whiteBoxMeshComponent)
init.update_white_box(whiteBoxMesh, whiteBoxMeshComponent)