Skip to content

Commit

Permalink
Merge pull request #5135 from nortikin/fix_5131_adaptive_edges_extend
Browse files Browse the repository at this point in the history
fix #5131 adaptive edges extend
  • Loading branch information
satabol authored Jul 15, 2024
2 parents a77b023 + e61d5b6 commit e117b2b
Show file tree
Hide file tree
Showing 7 changed files with 385 additions and 40 deletions.
86 changes: 77 additions & 9 deletions docs/nodes/modifier_make/edges_adaptative.rst
Original file line number Diff line number Diff line change
@@ -1,21 +1,89 @@
Adaptative Edges
================

.. image:: https://user-images.githubusercontent.com/14288520/201197929-f788a921-448e-4f13-a04c-15c763820840.png
:target: https://user-images.githubusercontent.com/14288520/201197929-f788a921-448e-4f13-a04c-15c763820840.png
.. image:: https://github.com/user-attachments/assets/b2e12f75-f2c1-46ff-9b39-df83d2d74380
:target: https://github.com/user-attachments/assets/b2e12f75-f2c1-46ff-9b39-df83d2d74380

Inputs
------

Examples:
- **Adaptive verts**.
- **Adaptive edges**. What edges are used as base:

.. image:: https://user-images.githubusercontent.com/14288520/201199410-17cf12ff-a2f0-4f17-822c-ab23ee07128e.png
:target: https://user-images.githubusercontent.com/14288520/201199410-17cf12ff-a2f0-4f17-822c-ab23ee07128e.png
.. image:: https://github.com/user-attachments/assets/9eac2148-bda4-4eed-baa3-4bbdbd46fa2c
:target: https://github.com/user-attachments/assets/9eac2148-bda4-4eed-baa3-4bbdbd46fa2c

- **Mask of adaptive edges**. What edges hide from using as adaptive edges. Can be used as Boolean mask or Indexes mask

.. image:: https://github.com/user-attachments/assets/ecb6fe06-b83d-4c44-8af4-5e8405e4452b
:target: https://github.com/user-attachments/assets/ecb6fe06-b83d-4c44-8af4-5e8405e4452b

if socket **Mask of adaptive edges** are not connected then all edges are ised:

.. image:: https://github.com/user-attachments/assets/81479547-9405-41d6-9c2a-260e575ed66d
:target: https://github.com/user-attachments/assets/81479547-9405-41d6-9c2a-260e575ed66d

- **Verts**.
- **Edges**. Mesh are used to adaptive

.. image:: https://github.com/user-attachments/assets/6a44b94e-f726-409f-b718-0e77e70dc575
:target: https://github.com/user-attachments/assets/6a44b94e-f726-409f-b718-0e77e70dc575

- **First adaptive index**.
- **Second adaptive index**. Indexes of vertices of Mesh that will be used to align with adaptive edges (you may use verts not only Ox direction)

.. image:: https://github.com/user-attachments/assets/b79aa32d-8d5f-4aee-95cf-7173a76f3f96
:target: https://github.com/user-attachments/assets/b79aa32d-8d5f-4aee-95cf-7173a76f3f96

.. image:: https://github.com/user-attachments/assets/f4ece3e3-36bd-494c-b5d8-28e23b336e4c
:target: https://github.com/user-attachments/assets/f4ece3e3-36bd-494c-b5d8-28e23b336e4c

If you swap indexes then shape of adaptive mesh will changed:

.. image:: https://github.com/user-attachments/assets/5a9444eb-3d94-4f09-8f38-8fae23242a60
:target: https://github.com/user-attachments/assets/5a9444eb-3d94-4f09-8f38-8fae23242a60

Parameters
----------

- **Join meshes**. Join all meshes to a single mesh.

Outputs
-------

- **Vertices**.
- **Edges**. Results mesh or meshes

Examples
========

Rotation of source mesh are transfered to the adaptive mesh
-----------------------------------------------------------

.. image:: https://github.com/user-attachments/assets/ce50368c-0f1e-413a-9915-0ef92e532b72
:target: https://github.com/user-attachments/assets/ce50368c-0f1e-413a-9915-0ef92e532b72

* Generator-> :doc:`Plane </nodes/generator/plane_mk3>`
* Generator-> :doc:`3pt Arc </nodes/generator/basic_3pt_arc>`
* Number-> :doc:`List Input </nodes/number/list_input>`
* Matrix-> :doc:`Matrix Input </nodes/matrix/input>`
* Viz-> :doc:`Viewer Index+ </nodes/viz/viewer_idx28>`


.. image:: https://github.com/user-attachments/assets/6796a0c3-7df6-4ec2-93a9-91f2dda3d4f7
:target: https://github.com/user-attachments/assets/6796a0c3-7df6-4ec2-93a9-91f2dda3d4f7

* Generator-> :doc:`Plane </nodes/generator/plane_mk3>`
* Generator-> :doc:`3pt Arc </nodes/generator/basic_3pt_arc>`
* Number-> :doc:`List Input </nodes/number/list_input>`
* Matrix-> :doc:`Matrix Input </nodes/matrix/input>`
* Viz-> :doc:`Viewer Index+ </nodes/viz/viewer_idx28>`

.. image:: https://github.com/user-attachments/assets/9891b297-a860-487f-aa46-d116b7d6001d
:target: https://github.com/user-attachments/assets/9891b297-a860-487f-aa46-d116b7d6001d

* Generator-> :doc:`NGon </nodes/generator/ngon>`
* Generator->Generatots Extended-> :doc:`Hilbert </nodes/generators_extended/hilbert>`
* Transform-> :doc:`Rotate </nodes/transforms/rotate_mk3>`
* Matrix-> :doc:`Matrix In </nodes/matrix/matrix_in_mk4>`
* Viz-> :doc:`Viewer Draw </nodes/viz/viewer_draw_mk4>`

.. image:: https://user-images.githubusercontent.com/14288520/201199136-18820783-fe1b-40d3-b197-34ea5aacd529.gif
:target: https://user-images.githubusercontent.com/14288520/201199136-18820783-fe1b-40d3-b197-34ea5aacd529.gif

2 changes: 1 addition & 1 deletion index.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -459,7 +459,7 @@
- ---
- SvBevelCurveNode
- SvSweepModulator
- SvAdaptiveEdgeNode
- SvAdaptiveEdgeNodeMK2
- SvAdaptivePolygonsNodeMk3
- SvDuplicateAlongEdgeNode
- SvFractalCurveNode
Expand Down
Binary file modified json_examples/CNC/CNC_PUZZLES.zip
Binary file not shown.
2 changes: 1 addition & 1 deletion menus/full_by_data_type.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@
- ---
- SvBevelCurveNode
- SvSweepModulator
- SvAdaptiveEdgeNode
- SvAdaptiveEdgeNodeMK2
- SvAdaptivePolygonsNodeMk3
- SvDuplicateAlongEdgeNode
- SvFractalCurveNode
Expand Down
2 changes: 1 addition & 1 deletion menus/full_nortikin.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@
- ---
- SvBevelCurveNode
- SvSweepModulator
- SvAdaptiveEdgeNode
- SvAdaptiveEdgeNodeMK2
- SvAdaptivePolygonsNodeMk3
- SvDuplicateAlongEdgeNode
- SvFractalCurveNode
Expand Down
Loading

0 comments on commit e117b2b

Please sign in to comment.