Commit Graph

1049 Commits

Author SHA1 Message Date
69b7cbb388 Removed the World Generator engine module. 2021-12-27 17:13:29 +01:00
da3109f98f Also remove the MainTPlanetGenerator. 2021-12-27 16:55:51 +01:00
0ed5e814b8 Removed most of the old world generator. only kept a few classes around, these now inherit from resource. 2021-12-27 16:38:46 +01:00
3ef478074f Spawn the test vendor and trainer to the proper place. 2021-12-27 16:15:11 +01:00
1cb11ca32a Fix hit stack calculation. 2021-12-27 14:27:33 +01:00
9fad900a51 The world generator now will look up the a spawner node, and get the starting coordinates from it. 2021-12-27 03:50:11 +01:00
fbd232df1b Added the village npc spawner code to the current spawner resource. 2021-12-27 03:49:37 +01:00
82435d4c59 Added parent pos setup to the world generator resources. 2021-12-27 03:48:55 +01:00
a44e362e31 Switched back from godot physics to bullet for now. 2021-12-27 03:47:59 +01:00
808c8e97d3 Now terra chunks are actually properly generated by placing chunks on the world generator's grid. 2021-12-27 02:38:05 +01:00
0cbf540e30 RectViewNodes now convert between yup and ydown coordinate systems to store rect.position.ys. 2021-12-27 02:36:52 +01:00
0c96328005 Ported the current world generator to the new addon. Now the world in-game uses the new world generator's resource to generate the terrain. 2021-12-26 21:14:41 +01:00
3adfad40a2 Added a seed parameter to the world generation methods. 2021-12-26 19:08:45 +01:00
47c49b56ab Added the needed methods for terrain generation. 2021-12-26 19:05:48 +01:00
8453518e8b Added a class selector to the world editor on add. 2021-12-26 18:52:23 +01:00
4ff14380a1 Added a new WorldGeneratorSettings resource which can store and load in world generator related classes from folders. 2021-12-26 18:51:46 +01:00
9cac983ff5 Added a new get_editor_class to the WoirldGeneratorBaseResource, and now the RectViewNode will also render it if it's not an empty string. 2021-12-26 18:50:09 +01:00
f739cca1f4 Now the added resource's rect gets recalculated on add_content() instead in create_content() 2021-12-26 18:48:29 +01:00
0a0f4ee865 The RectEditor now will only set a margin of max 50. 2021-12-26 13:10:15 +01:00
193ed69fef Also made the delete and duplicate buttons work for the zones editor and continent editor. 2021-12-26 00:28:32 +01:00
cc6669bb12 Implemented delete and duplicate buttons in world. Also made sure that the inspectors update properly after the edited resources change. 2021-12-26 00:25:30 +01:00
829b01b72f Set up proper drawing for RectViewNode. it grabs the required parameters from new methods in WorldGenBaseResource. 2021-12-26 00:03:17 +01:00
61b66b4109 Reduce the scale border's size to 5. 2021-12-25 23:41:50 +01:00
7b4f044f43 Fixed keeping zoom in RectView. 2021-12-25 23:34:33 +01:00
11aa1e1b6a Set up the rect property to expand horizontally. 2021-12-25 23:20:40 +01:00
a8dfb9a156 Fix label. 2021-12-25 23:14:51 +01:00
10ee9bb44a Similar cleanups to the SubZone editor. 2021-12-25 23:14:02 +01:00
1fa6903106 Cleaned up the methods in the Zone editor. Also fixed a few smaller usability issues. 2021-12-25 23:09:56 +01:00
900f402370 Set up the subzone editor. 2021-12-25 12:31:36 +01:00
0b74e33fc8 Set up the zone editor. 2021-12-25 12:18:59 +01:00
200a030882 Zero the positions of the created contents. 2021-12-25 11:30:22 +01:00
c21970b82f Also add the initial rect size setup code to Continent and Zone. 2021-12-25 03:26:33 +01:00
b7b36d47ab Set the selected continent into the widgets. 2021-12-25 03:25:42 +01:00
b30016bc28 Set up continent select dropdown. 2021-12-25 02:52:21 +01:00
65562c6523 Set the world into the continent editor. 2021-12-25 02:33:43 +01:00
c34b629b26 Move World's setup to the World class. 2021-12-25 02:32:00 +01:00
ba1c85b729 Set up the Continent editor's base ui. 2021-12-25 02:29:30 +01:00
13428b9a33 The world tab is now it's own scene. 2021-12-25 02:18:20 +01:00
87e4318e06 Implemented editing the names of resources in the DataList widget. 2021-12-25 02:15:17 +01:00
4cc9baf23b When adding a continent the world will set up a base size now. 2021-12-25 01:55:52 +01:00
6c438c97f4 Set the edited resource's rect after drag. 2021-12-25 01:51:35 +01:00
d07f9c4949 Fix RectViewNode's _draw(). 2021-12-25 01:48:56 +01:00
a4367ee257 Fix dragging. 2021-12-24 22:32:45 +01:00
9641d29001 Fix cursor switching on the borders in RectViewNode. 2021-12-24 22:25:56 +01:00
1a3a95809a Ported drag and resize code from godot's window dialog as a base for RectViewNode. 2021-12-24 22:20:30 +01:00
9aa18a9278 Implement zoom for RectView. 2021-12-23 18:08:13 +01:00
dd7024c0ed Basic RectView functionality. Renamed RectEditorNode to RectViewNode. 2021-12-23 17:45:36 +01:00
6b388b3c1b Removed stray print. 2021-12-23 16:51:59 +01:00
9c4c30b821 RectView basic setup. 2021-12-23 16:46:54 +01:00
c2e75ef147 Added a rect2 property. And started working on the rect editor. 2021-12-23 00:45:32 +01:00
3f7f5c0e07 Implement basic data list node. Also fix error spam. 2021-12-22 16:52:06 +01:00
afc929350b Work on the world editor. Also added a property editor similar to mat_maker_gd's nodes. 2021-12-22 16:15:39 +01:00
e44d367c0e Now world generator's resources inherit from a new base resource. 2021-12-22 16:14:26 +01:00
3524c3bf7f Ported EditorZoomWidget from godot4. 2021-12-22 11:27:15 +01:00
855b1120ab Add some exports to world generator's resources. 2021-12-22 10:03:55 +01:00
bbcd340cff Add a space to the text of the button that appears on the bottom. 2021-12-22 10:02:55 +01:00
e3f73103af Fix error. 2021-12-21 21:57:15 +01:00
5723a11825 Initial class and plugin setup. 2021-12-21 21:50:22 +01:00
c3093be0d4 Added a new world generator addon. 2021-12-21 21:25:35 +01:00
a643072963 Fixed missing VoxelWorld class error. 2021-12-19 14:20:47 +01:00
56866e65ba Updated mat_maker_gd. 2021-12-18 20:44:28 +01:00
991f327682 Fix 2 errors in mesh_data_resource_editor when a mesh data resource is empty. 2021-11-17 15:31:04 +01:00
baf4c89ce1 Small cleanups to transforms.gd. 2021-11-12 01:04:39 +01:00
0cb0559118 Color tiler node for mat_maker_gd. 2021-11-06 11:50:39 +01:00
1b9450cc74 Tiler node for mat_maker_gd. 2021-11-05 22:15:30 +01:00
b78f3c8358 Added 'pass' to cancel_render_and_wait, so if the lines that require ThreadPool are commented out it will not complain about scopes and indents. 2021-10-31 13:03:25 +01:00
547197e78f Improved the threading logic of MMMaterial's render by quite a bit. Also updated ThreadPool to get the new cleanups / fixes / api improvements required. 2021-10-31 12:37:51 +01:00
2a2918ddb7 Now the render can be cancelled. 2021-10-31 11:37:16 +01:00
ccc0a59a58 Return the default color if no image is set in image universal properties. 2021-10-31 11:30:14 +01:00
ee03da9a85 Implemented threaded generation for mat_maker_gd using ThreadPool. 2021-10-31 11:29:36 +01:00
d63dbbbf68 Math node for mat_maker_gd. 2021-10-30 15:52:14 +02:00
2dcac48022 fill_to_color and fill_to_random_color nodes for mat_maker_gd. 2021-10-30 11:40:09 +02:00
5ba662d628 Fill_to_random_grey node for mat_maker_gd. 2021-10-30 02:12:55 +02:00
170f50c31f Fill_to_position, fill_to_size, and fill_to_uv nodes for mat_maker_gd. 2021-10-29 18:20:21 +02:00
1d27ddd159 Greyscale quantize and tonality nodes. 2021-10-27 18:26:06 +02:00
f17de5a15d circle_map, kaleidoscope, mirror, repeat, rotate, scale, shear, transform, and translate nodes for mat_maker_gd. 2021-10-27 13:19:56 +02:00
96f2646ccb Decompose node. 2021-10-26 23:22:25 +02:00
5cf570a3d0 Swap channels node. 2021-10-26 23:14:35 +02:00
db5d96a4cd Combine node. 2021-10-26 23:00:52 +02:00
713fcfb490 Invert node. 2021-10-26 22:56:10 +02:00
77d2e64fe1 adjust_hsv node. 2021-10-26 22:51:51 +02:00
583415d5fb brightness_contrast node. 2021-10-26 17:16:19 +02:00
16910b5110 Fixed a few copy-paste errors, and removed 3 old nodes with test implementation. 2021-10-26 17:16:06 +02:00
1c988c54ed sdf3d_op_revolution and extrusion nodes. 2021-10-26 14:08:18 +02:00
182034fd82 sdf3d_op_morph node. 2021-10-26 13:52:55 +02:00
9252c7b21f sdf3d_op_elongation and rounded nodes. 2021-10-26 13:42:34 +02:00
1c8af1f3f7 sdf3d_op_repeat and circle_repeat nodes. 2021-10-26 13:26:59 +02:00
6429b4e725 sdf3d_op_bool and smooth_bool nodes. 2021-10-26 12:53:23 +02:00
ea9b0a1b2e sdf3d rotate, translate, and scale nodes. 2021-10-26 11:57:20 +02:00
32f80f288a sdf3d_shape_capsule node. 2021-10-26 11:37:08 +02:00
c7a2fea2c4 curve_base now has different initialization methods for the curve. sd_shape_line now initializes it's curve to the 1,1 variant. 2021-10-26 11:36:48 +02:00
920d4895e1 Fix and index in curves.gd. 2021-10-26 11:35:45 +02:00
6c5f2c0e95 sdf3d_shape cone and asd3d_shape_torus nodes. 2021-10-26 11:05:57 +02:00
709dd8081d sdf3d_shape_cylinder node. 2021-10-26 10:54:22 +02:00
e7556f14de sdf3d_shape_box node. 2021-10-26 10:47:27 +02:00
2f4f4888cf sdf3d_color node. 2021-10-26 10:38:57 +02:00
c5c75a4d40 Removed the ptex files. 2021-10-24 13:39:16 +02:00
783532fe93 Recreated the rest of the textures which was made with material maker wityh mat_maker_gd. 2021-10-24 13:38:49 +02:00
a0a54b388f Rename the row_col parameter to col_row in brick as it was supposed to be. 2021-10-24 13:33:27 +02:00
23fd87a294 Recreated the grass texture in mat_maker_gd. 2021-10-24 13:14:49 +02:00
facdcb6469 Now implemented node deletion. 2021-10-24 12:49:49 +02:00
b609b3caa4 Fixed the alpha of the dirt texture with the new fill channel node. 2021-10-24 11:59:38 +02:00
a165061608 Added a new fill channel node. 2021-10-24 11:48:38 +02:00
daf42e692c Apparently the blend node handles transparency properly, the original dirt texture had the same transparency issue. (I'll fix that later.) So added a make_tileable node to it, and made it export the texture. 2021-10-24 02:42:03 +02:00
33be950fd6 Make texture slots scale their images. Also their size is now set to 128x128. 2021-10-24 02:37:14 +02:00
898ec5a387 Small improvement for the blend node. It still doesn't handles transparency properly. 2021-10-24 02:15:32 +02:00
dfa3b7ed51 Reworked the colorize node, this fixes it's output via connections. 2021-10-24 01:59:20 +02:00
baa30dd3f5 Recreated the dirt texture with mat_maker_gd. 2021-10-24 01:18:40 +02:00
676de9083c make_tileable node. 2021-10-24 01:01:15 +02:00
a5e81bc69c Gaussian blur node. 2021-10-24 00:44:02 +02:00
61c6ea476e Emboss node. 2021-10-23 21:36:41 +02:00
2f4912c2b9 blend node. 2021-10-23 20:10:14 +02:00
e42a25a53b sdf3d_render and sdf3d_sphere nodes. 2021-10-23 00:18:44 +02:00
577e9d705a Curve node. 2021-10-22 23:24:29 +02:00
fc8fa79624 sd_op_morph node. 2021-10-22 11:06:17 +02:00
27ba62e20a sd_op_circle_repeat node. 2021-10-22 11:01:35 +02:00
8a896d0e3d sd_repeat node. 2021-10-22 10:51:06 +02:00
d570d8aea3 sd_annular_shape node. 2021-10-22 10:15:12 +02:00
d2dd31ae72 sd_op_ronded_shape node. 2021-10-22 09:29:34 +02:00
d4da602f65 sd_op_smooth_bool node. 2021-10-21 21:41:18 +02:00
c849944f2b Fix typo. 2021-10-21 21:39:48 +02:00
89b6600dd9 sd_op_bool node. 2021-10-21 21:33:49 +02:00
dc56ca252b sd_tf_scale, sd_tf_rotate, sd_tf_translate nodes. 2021-10-20 20:22:44 +02:00
6f2437279e Fixed curves, and the curve editor, and added curve support for sd_shape_line. 2021-10-20 19:53:05 +02:00
3841c50674 Added sd_shape_line node. Initial setup for curves, but they don't yet work properly with it. 2021-10-20 18:33:11 +02:00
bb7fee062c Make sure that polygon's changed method is called even when the control points were only moved. 2021-10-20 18:06:02 +02:00
17d0dc99dd Actually export the points in polygon base. 2021-10-20 17:59:50 +02:00
5d0c999103 Emit changed events properly in sd shapes. 2021-10-20 17:57:42 +02:00
1e57dba26e Better output text for the arc and circle shape nodes, and removed sdf.gd. 2021-10-20 17:47:40 +02:00
a690c76612 Made the polygon editor work with my setup, and added sd_polygon_shape node. 2021-10-20 17:46:31 +02:00
c082ee9a60 Added the curve editor and polygon editor from Material Maker. I only fixed compile so far. 2021-10-20 11:54:54 +02:00
df1a1c59a2 sd_shape_arc and sd_shape_rhombus nodes. 2021-10-19 22:42:03 +02:00
2984eef392 sd_shape_box node. 2021-10-19 22:20:45 +02:00
01c886d56f Now sd_shape_circle will emit changed events properly for it's type. 2021-10-19 18:26:12 +02:00
bcd0fdbbb1 Added sd show and sd shape circle nodes. 2021-10-19 18:04:00 +02:00
47cb1b8086 Voronoi node. 2021-10-19 15:38:12 +02:00
8feda525db FBM noise node. 2021-10-19 13:43:35 +02:00
fb502505a3 Anisotropic noise node. 2021-10-19 13:08:50 +02:00
7ef34acfbf Color noise node. 2021-10-19 12:44:02 +02:00
31547bf86f Color value node. 2021-10-19 12:21:56 +02:00
98ade190f9 Value node. 2021-10-19 12:13:15 +02:00
0cd3f2d8db Noise node. 2021-10-19 11:15:01 +02:00
dade6413b3 Cleaned up the noises folder. 2021-10-18 20:20:29 +02:00
a317240526 Scratches node. 2021-10-18 20:06:49 +02:00
0e07f2388c sine_wave node. 2021-10-18 19:39:51 +02:00
63713bc6cd Fix random color output on the bricks node. 2021-10-18 19:28:06 +02:00
c91c947871 Beehive node. 2021-10-18 19:26:54 +02:00
6ea422c166 IChing node. 2021-10-18 18:44:39 +02:00
a186c71f9a Runes node. 2021-10-18 18:14:08 +02:00
2b2c485992 Weave pattern node. 2021-10-18 17:59:57 +02:00
e6468b8226 Added the bricks node. 2021-10-18 15:32:30 +02:00
095fcab86c Truchet node. 2021-10-18 14:16:50 +02:00
4f6829beb3 Pattern node. 2021-10-18 14:01:18 +02:00
c634c3b882 Colorize node. 2021-10-18 13:17:25 +02:00
e04f17dac2 Added the image picker button from Material Maker. Also added image node. 2021-10-18 12:33:31 +02:00
e036935e4b Removed a few unneeded classes. 2021-10-18 11:01:38 +02:00
c9edde9ef9 Added uniform and greyscale_uniform nodes for mat_maker_gd. 2021-10-18 11:00:13 +02:00
01bb81675e Lots of work on gradient_type_4. It doesn't work properly yet, however the current implementation produces a cyberpunk-ish neon like effect, so I also saved it as gradient_type_5 for the time being. 2021-10-17 21:01:54 +02:00
56aa47ccc3 Radial gradient node. 2021-10-17 17:41:50 +02:00
f74ad34219 Implemented circular gradient node, and fixed circular gradient calculation. 2021-10-17 17:40:16 +02:00
6a241d3051 Split the new gradient node into a gradient_base and gradient nodes. 2021-10-17 17:23:06 +02:00
4282cc8385 Implemented the gradient node. Made Material Maker's gradient editor work with my setup. 2021-10-17 17:18:41 +02:00
d23c7b00b8 Turned the widget scripts into tool scripts. 2021-10-17 00:58:07 +02:00
7dfdf6c1ce Also added the icons, and fixed all resource paths. 2021-10-17 00:35:35 +02:00
45fc6bcdbd Added the color picker, the float edit, and the gradient editor widgets from material maker. 2021-10-17 00:11:51 +02:00
7ab05bf407 Renamed colors.gd to filter.gd. 2021-10-13 18:51:34 +02:00
bfcf4b0475 Went through the rest of the .mmg files. 2021-10-13 18:48:59 +02:00
bf0afa6ad6 Tuned most of the remaining .mmg files into comments. 2021-10-13 12:54:29 +02:00
8a907bfb6b Turned a lot more mmg files into comments. 2021-10-13 00:38:05 +02:00
a25d43ae29 Turned all except one sdf related mmg files into comments. In a more crude way than before. 2021-10-12 22:23:31 +02:00
c9fe275357 Processed a 4 more mmg files. 2021-10-12 19:59:24 +02:00
c54948d81a Turn more .mmg files into comments. 2021-10-12 19:04:40 +02:00
ea795998cf Comments from weave.mmg and weave2.mmg. 2021-10-12 18:20:07 +02:00
3ceb7a3236 Comments from the rest of the sdf3d mmg files. 2021-10-12 17:54:31 +02:00
666f735379 Comments from sdf3d_color.mmg. 2021-10-12 16:48:51 +02:00
56ebdb0ec5 Comments from iching.mmg. 2021-10-12 16:36:20 +02:00
e6d4b2b755 Comments from sdf3d_angle.mmg. 2021-10-12 13:20:15 +02:00
33e8a8adb0 Comments from sdf3d_circle_repeat.mmg. 2021-10-12 13:07:06 +02:00
4ee9c69d15 Comments from sdf3d_boolean.mmg. 2021-10-12 12:24:38 +02:00
d75ee3dac2 Comments from sdf3d_torus.mmg. 2021-10-12 12:16:46 +02:00
95eb126b8f Comments from sdf3d_plane.mmg. 2021-10-12 12:11:49 +02:00
55c23bc6b2 Comments from sdf3d_cylinder.mmg. 2021-10-12 11:58:46 +02:00
2eabdc5536 COmments from sdf3d_rotate.mmg. 2021-10-12 11:27:32 +02:00
a5b96ad8f1 Comments from scratches.mmg. 2021-10-12 11:12:20 +02:00
eacc08e69a Comments from runes.mmg. 2021-10-12 10:58:39 +02:00
13e3d248d0 Notes from sdf3d_repeat.mmg. 2021-10-11 20:12:34 +02:00
52d73a0abd Comments from sdf3d_cone.mmg. 2021-10-11 16:41:39 +02:00
8fff2bc0e9 Comments from sdf3d_capsule.mmg. 2021-10-11 14:14:05 +02:00
1a65e35471 Notes from sdf3d_sphere.mmg. 2021-10-11 13:40:13 +02:00
3f12c7c23e Notes from sdf3d_box.mmg. 2021-10-11 13:30:58 +02:00
b04d8b7fc6 Notes from uneven_bricks.mmg. 2021-10-11 13:18:24 +02:00
b31eb46120 Notes from bricks.mmg. Also improvements to beehive notes. 2021-10-11 12:55:18 +02:00
b622bb2f73 Turned pattern.mmg to notes. 2021-10-11 11:47:00 +02:00
d6148fd43c Notes for the beehive pattern. 2021-10-11 11:01:42 +02:00
f6e1207c3e Notes for noise_fbm.gd. 2021-10-11 10:51:00 +02:00
b077bc83ac Add relevant comments from radial_gradient.mmg and circular_gradient.mmg. 2021-10-11 10:20:56 +02:00
44df757149 Add relevant thingd as comments from gradient.mmg to gradients.gd. 2021-10-10 10:39:23 +02:00
bfd32409d2 Added more notes to colors.gd, and removed the corresponding material maker mmg files. 2021-10-10 09:00:39 +02:00
c07ca3d8d8 Implement restoring node connections on opening an MMMaterian in mat_maker_gd's editor. 2021-10-09 19:30:57 +02:00
da126d1d45 Removed the input and output slot type parameter from the simple MMGraphNode property methods. Input and output was only available with universal properties anyway. 2021-10-09 19:15:15 +02:00