Skip to content

Commit

Permalink
enabled multithreaded execution, conceptgraph 2D and 3D nodes, progre…
Browse files Browse the repository at this point in the history 
…ss icon
  • Loading branch information
@HungryProton
HungryProton committed May 30, 2020
1 parent e7f375f commit 9e6d16f
Show file tree
Hide file tree
Showing 26 changed files with 837 additions and 133 deletions.
347 changes: 346 additions & 1 deletion examples/templates/palm_tree.cgraph
View file
Original file line number Diff line number Diff line change
@@ -1 +1,346 @@
{"connections":[{"from":"GraphNode3","from_port":0,"to":"GraphNode4","to_port":1},{"from":"GraphNode5","from_port":0,"to":"GraphNode6","to_port":0},{"from":"GraphNode6","from_port":0,"to":"GraphNode4","to_port":0},{"from":"GraphNode7","from_port":0,"to":"GraphNode4","to_port":2},{"from":"GraphNode8","from_port":0,"to":"GraphNode5","to_port":1},{"from":"GraphNode4","from_port":0,"to":"GraphNode13","to_port":0},{"from":"GraphNode12","from_port":0,"to":"GraphNode13","to_port":1},{"from":"GraphNode13","from_port":0,"to":"GraphNode","to_port":0},{"from":"GraphNode14","from_port":0,"to":"GraphNode15","to_port":0},{"from":"GraphNode2","from_port":0,"to":"GraphNode17","to_port":0},{"from":"GraphNode17","from_port":0,"to":"GraphNode16","to_port":0},{"from":"GraphNode21","from_port":0,"to":"GraphNode19","to_port":1},{"from":"GraphNode19","from_port":0,"to":"GraphNode17","to_port":1},{"from":"GraphNode15","from_port":0,"to":"GraphNode19","to_port":0},{"from":"GraphNode18","from_port":0,"to":"GraphNode21","to_port":0}],"nodes":[{"data":{"comment_text":"Create palm leaves"},"editor":{"offset_x":60,"offset_y":-100,"rect_x":1199.000244,"rect_y":532.000366,"slots":{}},"name":"GraphNode20","type":"comment"},{"data":{"comment_text":"Trunk mesh generation"},"editor":{"offset_x":-1600,"offset_y":-100,"rect_x":1642.000244,"rect_y":527.000366,"slots":{}},"name":"GraphNode11","type":"comment"},{"data":{},"editor":{"offset_x":-960,"offset_y":0,"slots":{}},"name":"GraphNode6","type":"curve_tesselate_exact"},{"data":{},"editor":{"offset_x":-960,"offset_y":100,"slots":{"0":"trunk"}},"name":"GraphNode3","type":"nodetree_input_curve"},{"data":{},"editor":{"offset_x":-960,"offset_y":180,"slots":{"0":"trunk profile"}},"name":"GraphNode7","type":"inspector_curve_2d"},{"data":{},"editor":{"offset_x":-660,"offset_y":0,"slots":{"3":0.25,"4":true}},"name":"GraphNode4","type":"extrude_bevel_along_path"},{"data":{},"editor":{"offset_x":-1260,"offset_y":0,"slots":{"0":8,"1":1}},"name":"GraphNode5","type":"curve_generator_polygon"},{"data":{},"editor":{"offset_x":-660,"offset_y":200,"slots":{"0":"trunk material"}},"name":"GraphNode12","type":"inspector_spatial_material"},{"data":{},"editor":{"offset_x":-360,"offset_y":0,"slots":{"2":false}},"name":"GraphNode13","type":"set_material_to_node"},{"data":{},"editor":{"offset_x":-80,"offset_y":0,"slots":{}},"name":"GraphNode","type":"final_output"},{"data":{},"editor":{"offset_x":160,"offset_y":80,"slots":{"0":"trunk"}},"name":"GraphNode14","type":"nodetree_input_curve"},{"data":{},"editor":{"offset_x":360,"offset_y":80,"slots":{"1":0.028,"2":0.8,"3":1,"4":false}},"name":"GraphNode15","type":"curve_sample_points_constant"},{"data":{},"editor":{"offset_x":100,"offset_y":280,"slots":{"0":"leaves angle","1":1}},"name":"GraphNode18","type":"inspector_scalar"},{"data":{},"editor":{"offset_x":640,"offset_y":-40,"slots":{"0":"leaves_2","1":false}},"name":"GraphNode2","type":"input_generic"},{"data":{},"editor":{"offset_x":-1560,"offset_y":20,"slots":{"0":"trunk radius","1":1}},"name":"GraphNode8","type":"inspector_scalar"},{"data":{},"editor":{"offset_x":-1200,"offset_y":280,"slots":{"0":"trunk resolution","1":1}},"name":"GraphNode10","type":"inspector_scalar"},{"data":{},"editor":{"offset_x":360,"offset_y":280,"slots":{"0":0,"1":360,"2":0}},"name":"GraphNode21","type":"value_vector3"},{"data":{},"editor":{"offset_x":640,"offset_y":80,"slots":{"2":0,"3":true}},"name":"GraphNode19","type":"rotate_transforms_random"},{"data":{},"editor":{"offset_x":1120,"offset_y":40,"slots":{}},"name":"GraphNode16","type":"final_output"},{"data":{},"editor":{"offset_x":880,"offset_y":40,"slots":{}},"name":"GraphNode17","type":"make_multimesh"}]}
{
"connections": [
{
"from": "GraphNode3",
"from_port": 0,
"to": "GraphNode4",
"to_port": 1
},
{
"from": "GraphNode5",
"from_port": 0,
"to": "GraphNode6",
"to_port": 0
},
{
"from": "GraphNode6",
"from_port": 0,
"to": "GraphNode4",
"to_port": 0
},
{
"from": "GraphNode7",
"from_port": 0,
"to": "GraphNode4",
"to_port": 2
},
{
"from": "GraphNode8",
"from_port": 0,
"to": "GraphNode5",
"to_port": 1
},
{
"from": "GraphNode4",
"from_port": 0,
"to": "GraphNode13",
"to_port": 0
},
{
"from": "GraphNode12",
"from_port": 0,
"to": "GraphNode13",
"to_port": 1
},
{
"from": "GraphNode13",
"from_port": 0,
"to": "GraphNode",
"to_port": 0
},
{
"from": "GraphNode14",
"from_port": 0,
"to": "GraphNode15",
"to_port": 0
},
{
"from": "GraphNode2",
"from_port": 0,
"to": "GraphNode17",
"to_port": 0
},
{
"from": "GraphNode17",
"from_port": 0,
"to": "GraphNode16",
"to_port": 0
},
{
"from": "GraphNode21",
"from_port": 0,
"to": "GraphNode19",
"to_port": 1
},
{
"from": "GraphNode19",
"from_port": 0,
"to": "GraphNode17",
"to_port": 1
},
{
"from": "GraphNode15",
"from_port": 0,
"to": "GraphNode19",
"to_port": 0
},
{
"from": "GraphNode18",
"from_port": 0,
"to": "GraphNode21",
"to_port": 0
}
],
"nodes": [
{
"data": {
"comment_text": "Create palm leaves"
},
"editor": {
"offset_x": 60,
"offset_y": -100,
"rect_x": 1199.000244,
"rect_y": 532.000366,
"slots": {}
},
"name": "GraphNode20",
"type": "comment"
},
{
"data": {
"comment_text": "Trunk mesh generation"
},
"editor": {
"offset_x": -1600,
"offset_y": -100,
"rect_x": 1642.000244,
"rect_y": 527.000366,
"slots": {}
},
"name": "GraphNode11",
"type": "comment"
},
{
"data": {},
"editor": {
"offset_x": -960,
"offset_y": 0,
"slots": {}
},
"name": "GraphNode6",
"type": "curve_tesselate_exact"
},
{
"data": {},
"editor": {
"offset_x": -960,
"offset_y": 100,
"slots": {
"0": "trunk"
}
},
"name": "GraphNode3",
"type": "nodetree_input_curve"
},
{
"data": {},
"editor": {
"offset_x": -960,
"offset_y": 180,
"slots": {
"0": "trunk profile"
}
},
"name": "GraphNode7",
"type": "inspector_curve_2d"
},
{
"data": {},
"editor": {
"offset_x": -660,
"offset_y": 0,
"slots": {
"3": 0.25,
"4": true,
"5": 1,
"6": 1
}
},
"name": "GraphNode4",
"type": "extrude_bevel_along_path"
},
{
"data": {},
"editor": {
"offset_x": -1260,
"offset_y": 0,
"slots": {
"0": 8,
"1": 1
}
},
"name": "GraphNode5",
"type": "curve_generator_polygon"
},
{
"data": {},
"editor": {
"offset_x": -360,
"offset_y": 0,
"slots": {
"2": false
}
},
"name": "GraphNode13",
"type": "set_material_to_node"
},
{
"data": {},
"editor": {
"offset_x": -80,
"offset_y": 0,
"slots": {}
},
"name": "GraphNode",
"type": "final_output"
},
{
"data": {},
"editor": {
"offset_x": 160,
"offset_y": 80,
"slots": {
"0": "trunk"
}
},
"name": "GraphNode14",
"type": "nodetree_input_curve"
},
{
"data": {},
"editor": {
"offset_x": 360,
"offset_y": 80,
"slots": {
"1": 0.028,
"2": 0.8,
"3": 1,
"4": false
}
},
"name": "GraphNode15",
"type": "curve_sample_points_constant"
},
{
"data": {},
"editor": {
"offset_x": 100,
"offset_y": 280,
"slots": {
"0": "leaves angle",
"1": 1
}
},
"name": "GraphNode18",
"type": "inspector_scalar"
},
{
"data": {},
"editor": {
"offset_x": 640,
"offset_y": -40,
"slots": {
"0": "leaves_2",
"1": false
}
},
"name": "GraphNode2",
"type": "input_generic"
},
{
"data": {},
"editor": {
"offset_x": -1560,
"offset_y": 20,
"slots": {
"0": "trunk radius",
"1": 1
}
},
"name": "GraphNode8",
"type": "inspector_scalar"
},
{
"data": {},
"editor": {
"offset_x": -1200,
"offset_y": 280,
"slots": {
"0": "trunk resolution",
"1": 1
}
},
"name": "GraphNode10",
"type": "inspector_scalar"
},
{
"data": {},
"editor": {
"offset_x": 360,
"offset_y": 280,
"slots": {
"0": 0,
"1": 360,
"2": 0
}
},
"name": "GraphNode21",
"type": "value_vector3"
},
{
"data": {},
"editor": {
"offset_x": 640,
"offset_y": 80,
"slots": {
"2": 0,
"3": true
}
},
"name": "GraphNode19",
"type": "rotate_transforms_random"
},
{
"data": {},
"editor": {
"offset_x": 1120,
"offset_y": 40,
"slots": {}
},
"name": "GraphNode16",
"type": "final_output"
},
{
"data": {},
"editor": {
"offset_x": 880,
"offset_y": 40,
"slots": {}
},
"name": "GraphNode17",
"type": "make_multimesh"
},
{
"data": {},
"editor": {
"offset_x": -660,
"offset_y": 260,
"slots": {
"0": "trunk material"
}
},
"name": "GraphNode12",
"type": "inspector_spatial_material"
}
]
}
1 change: 1 addition & 0 deletions icons/progress/icon_progress_1.svg
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
34 changes: 34 additions & 0 deletions icons/progress/icon_progress_1.svg.import
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
[remap]

importer="texture"
type="StreamTexture"
path="res://.import/icon_progress_1.svg-0d7a6ef43593d0221806b418cc24fe77.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://addons/concept_graph/icons/progress/icon_progress_1.svg"
dest_files=[ "res://.import/icon_progress_1.svg-0d7a6ef43593d0221806b418cc24fe77.stex" ]

[params]

compress/mode=0
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=true
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
stream=false
size_limit=0
detect_3d=true
svg/scale=1.0
1 change: 1 addition & 0 deletions icons/progress/icon_progress_2.svg
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 9e6d16f

Please sign in to comment.