diff --git a/PixelComposer.resource_order b/PixelComposer.resource_order index d0ea3e659..c378c3655 100644 --- a/PixelComposer.resource_order +++ b/PixelComposer.resource_order @@ -1661,6 +1661,7 @@ {"name":"s_add_24","order":11,"path":"sprites/s_add_24/s_add_24.yy",}, {"name":"s_add_32","order":12,"path":"sprites/s_add_32/s_add_32.yy",}, {"name":"s_add_64","order":13,"path":"sprites/s_add_64/s_add_64.yy",}, + {"name":"s_add_node_bg","order":45,"path":"sprites/s_add_node_bg/s_add_node_bg.yy",}, {"name":"s_add_node_search_high","order":14,"path":"sprites/s_add_node_search_high/s_add_node_search_high.yy",}, {"name":"s_addon_setting","order":8,"path":"sprites/s_addon_setting/s_addon_setting.yy",}, {"name":"s_addon","order":7,"path":"sprites/s_addon/s_addon.yy",}, @@ -2411,6 +2412,7 @@ {"name":"s_node_text","order":1,"path":"sprites/s_node_text/s_node_text.yy",}, {"name":"s_node_texture_map","order":53,"path":"sprites/s_node_texture_map/s_node_texture_map.yy",}, {"name":"s_node_threshold","order":54,"path":"sprites/s_node_threshold/s_node_threshold.yy",}, + {"name":"s_node_tile_random","order":22,"path":"sprites/s_node_tile_random/s_node_tile_random.yy",}, {"name":"s_node_time_map","order":55,"path":"sprites/s_node_time_map/s_node_time_map.yy",}, {"name":"s_node_timeline_preview","order":2,"path":"sprites/s_node_timeline_preview/s_node_timeline_preview.yy",}, {"name":"s_node_to_number","order":11,"path":"sprites/s_node_to_number/s_node_to_number.yy",}, diff --git a/PixelComposer.yyp b/PixelComposer.yyp index 3fd38ef2c..4d27748b8 100644 --- a/PixelComposer.yyp +++ b/PixelComposer.yyp @@ -395,7 +395,120 @@ {"$GMIncludedFile":"","%Name":"Nodes.zip","CopyToMask":-1,"filePath":"datafiles/data","name":"Nodes.zip","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"related_node.json","CopyToMask":-1,"filePath":"datafiles/data","name":"related_node.json","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"Theme.zip","CopyToMask":-1,"filePath":"datafiles/data","name":"Theme.zip","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, - {"$GMIncludedFile":"","%Name":"tooltip.zip","CopyToMask":3035426170322551022,"filePath":"datafiles/data","name":"tooltip.zip","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"Tooltip.zip","CopyToMask":-1,"filePath":"datafiles/data","name":"Tooltip.zip","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"~$tooltips.afdesign~tmp","CopyToMask":-1,"filePath":"datafiles/data/Tooltip","name":"~$tooltips.afdesign~tmp","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"Node_2D_light.png","CopyToMask":-1,"filePath":"datafiles/data/Tooltip","name":"Node_2D_light.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"Node_9Slice.png","CopyToMask":-1,"filePath":"datafiles/data/Tooltip","name":"Node_9Slice.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"Node_Alpha_Cutoff.png","CopyToMask":-1,"filePath":"datafiles/data/Tooltip","name":"Node_Alpha_Cutoff.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"Node_Atlas.png","CopyToMask":-1,"filePath":"datafiles/data/Tooltip","name":"Node_Atlas.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"Node_Average.png","CopyToMask":-1,"filePath":"datafiles/data/Tooltip","name":"Node_Average.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"Node_Bend.png","CopyToMask":-1,"filePath":"datafiles/data/Tooltip","name":"Node_Bend.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"Node_Bevel.png","CopyToMask":-1,"filePath":"datafiles/data/Tooltip","name":"Node_Bevel.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"Node_Blend_Edge.png","CopyToMask":-1,"filePath":"datafiles/data/Tooltip","name":"Node_Blend_Edge.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"Node_Blend.png","CopyToMask":-1,"filePath":"datafiles/data/Tooltip","name":"Node_Blend.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"Node_Blobify.png","CopyToMask":-1,"filePath":"datafiles/data/Tooltip","name":"Node_Blobify.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"Node_Bloom.png","CopyToMask":-1,"filePath":"datafiles/data/Tooltip","name":"Node_Bloom.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"Node_Blur_Bokeh.png","CopyToMask":-1,"filePath":"datafiles/data/Tooltip","name":"Node_Blur_Bokeh.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"Node_Blur_Contrast.png","CopyToMask":-1,"filePath":"datafiles/data/Tooltip","name":"Node_Blur_Contrast.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"Node_Blur_Directional.png","CopyToMask":-1,"filePath":"datafiles/data/Tooltip","name":"Node_Blur_Directional.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"Node_Blur_Path.png","CopyToMask":-1,"filePath":"datafiles/data/Tooltip","name":"Node_Blur_Path.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"Node_Blur_Radial.png","CopyToMask":-1,"filePath":"datafiles/data/Tooltip","name":"Node_Blur_Radial.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"Node_Blur_Shape.png","CopyToMask":-1,"filePath":"datafiles/data/Tooltip","name":"Node_Blur_Shape.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"Node_Blur_Simple.png","CopyToMask":-1,"filePath":"datafiles/data/Tooltip","name":"Node_Blur_Simple.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"Node_Blur_Zoom.png","CopyToMask":-1,"filePath":"datafiles/data/Tooltip","name":"Node_Blur_Zoom.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"Node_Blur.png","CopyToMask":-1,"filePath":"datafiles/data/Tooltip","name":"Node_Blur.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"Node_Brush_Linear.png","CopyToMask":-1,"filePath":"datafiles/data/Tooltip","name":"Node_Brush_Linear.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"Node_BW.png","CopyToMask":-1,"filePath":"datafiles/data/Tooltip","name":"Node_BW.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"Node_Camera.png","CopyToMask":-1,"filePath":"datafiles/data/Tooltip","name":"Node_Camera.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"Node_Canvas.png","CopyToMask":-1,"filePath":"datafiles/data/Tooltip","name":"Node_Canvas.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"Node_Cellular.png","CopyToMask":-1,"filePath":"datafiles/data/Tooltip","name":"Node_Cellular.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"Node_Checker.png","CopyToMask":-1,"filePath":"datafiles/data/Tooltip","name":"Node_Checker.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"Node_Chromatic_Aberration.png","CopyToMask":-1,"filePath":"datafiles/data/Tooltip","name":"Node_Chromatic_Aberration.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"Node_Color_adjust.png","CopyToMask":-1,"filePath":"datafiles/data/Tooltip","name":"Node_Color_adjust.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"Node_Color_Remove.png","CopyToMask":-1,"filePath":"datafiles/data/Tooltip","name":"Node_Color_Remove.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"Node_Color_replace.png","CopyToMask":-1,"filePath":"datafiles/data/Tooltip","name":"Node_Color_replace.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"Node_Colorize.png","CopyToMask":-1,"filePath":"datafiles/data/Tooltip","name":"Node_Colorize.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"Node_Colors_Replace.png","CopyToMask":-1,"filePath":"datafiles/data/Tooltip","name":"Node_Colors_Replace.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"Node_Composite.png","CopyToMask":-1,"filePath":"datafiles/data/Tooltip","name":"Node_Composite.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"Node_Convolution.png","CopyToMask":-1,"filePath":"datafiles/data/Tooltip","name":"Node_Convolution.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"Node_Corner.png","CopyToMask":-1,"filePath":"datafiles/data/Tooltip","name":"Node_Corner.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"Node_Crop_Content.png","CopyToMask":-1,"filePath":"datafiles/data/Tooltip","name":"Node_Crop_Content.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"Node_Crop.png","CopyToMask":-1,"filePath":"datafiles/data/Tooltip","name":"Node_Crop.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"Node_Curve_HSV.png","CopyToMask":-1,"filePath":"datafiles/data/Tooltip","name":"Node_Curve_HSV.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"Node_Curve.png","CopyToMask":-1,"filePath":"datafiles/data/Tooltip","name":"Node_Curve.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"Node_Dilate.png","CopyToMask":-1,"filePath":"datafiles/data/Tooltip","name":"Node_Dilate.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"Node_Displace.png","CopyToMask":-1,"filePath":"datafiles/data/Tooltip","name":"Node_Displace.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"Node_Dither.png","CopyToMask":-1,"filePath":"datafiles/data/Tooltip","name":"Node_Dither.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"Node_Edge_Detect.png","CopyToMask":-1,"filePath":"datafiles/data/Tooltip","name":"Node_Edge_Detect.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"Node_Erode.png","CopyToMask":-1,"filePath":"datafiles/data/Tooltip","name":"Node_Erode.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"Node_Export.png","CopyToMask":-1,"filePath":"datafiles/data/Tooltip","name":"Node_Export.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"Node_Flip.png","CopyToMask":-1,"filePath":"datafiles/data/Tooltip","name":"Node_Flip.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"Node_FXAA.png","CopyToMask":-1,"filePath":"datafiles/data/Tooltip","name":"Node_FXAA.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"Node_Gamma_Map.png","CopyToMask":-1,"filePath":"datafiles/data/Tooltip","name":"Node_Gamma_Map.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"Node_Glow.png","CopyToMask":-1,"filePath":"datafiles/data/Tooltip","name":"Node_Glow.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"Node_Gradient_Points.png","CopyToMask":-1,"filePath":"datafiles/data/Tooltip","name":"Node_Gradient_Points.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"Node_Gradient.png","CopyToMask":-1,"filePath":"datafiles/data/Tooltip","name":"Node_Gradient.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"Node_Grain.png","CopyToMask":-1,"filePath":"datafiles/data/Tooltip","name":"Node_Grain.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"Node_Greyscale.png","CopyToMask":-1,"filePath":"datafiles/data/Tooltip","name":"Node_Greyscale.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"Node_Grid_Hex.png","CopyToMask":-1,"filePath":"datafiles/data/Tooltip","name":"Node_Grid_Hex.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"Node_Grid_Tri.png","CopyToMask":-1,"filePath":"datafiles/data/Tooltip","name":"Node_Grid_Tri.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"Node_Grid.png","CopyToMask":-1,"filePath":"datafiles/data/Tooltip","name":"Node_Grid.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"Node_Image_Animated.png","CopyToMask":-1,"filePath":"datafiles/data/Tooltip","name":"Node_Image_Animated.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"Node_Image_gif.png","CopyToMask":-1,"filePath":"datafiles/data/Tooltip","name":"Node_Image_gif.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"Node_Image_Sequence.png","CopyToMask":-1,"filePath":"datafiles/data/Tooltip","name":"Node_Image_Sequence.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"Node_Image_Sheet.png","CopyToMask":-1,"filePath":"datafiles/data/Tooltip","name":"Node_Image_Sheet.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"Node_Image.png","CopyToMask":-1,"filePath":"datafiles/data/Tooltip","name":"Node_Image.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"Node_Invert.png","CopyToMask":-1,"filePath":"datafiles/data/Tooltip","name":"Node_Invert.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"Node_JPEG.png","CopyToMask":-1,"filePath":"datafiles/data/Tooltip","name":"Node_JPEG.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"Node_Kuwahara.png","CopyToMask":-1,"filePath":"datafiles/data/Tooltip","name":"Node_Kuwahara.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"Node_Level_Selector.png","CopyToMask":-1,"filePath":"datafiles/data/Tooltip","name":"Node_Level_Selector.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"Node_Level.png","CopyToMask":-1,"filePath":"datafiles/data/Tooltip","name":"Node_Level.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"Node_Line.png","CopyToMask":-1,"filePath":"datafiles/data/Tooltip","name":"Node_Line.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"Node_Local_Analyze.png","CopyToMask":-1,"filePath":"datafiles/data/Tooltip","name":"Node_Local_Analyze.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"Node_Mesh_Warp.png","CopyToMask":-1,"filePath":"datafiles/data/Tooltip","name":"Node_Mesh_Warp.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"Node_Mirror.png","CopyToMask":-1,"filePath":"datafiles/data/Tooltip","name":"Node_Mirror.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"Node_Noise_Aniso.png","CopyToMask":-1,"filePath":"datafiles/data/Tooltip","name":"Node_Noise_Aniso.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"Node_Noise_Simplex.png","CopyToMask":-1,"filePath":"datafiles/data/Tooltip","name":"Node_Noise_Simplex.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"Node_Noise.png","CopyToMask":-1,"filePath":"datafiles/data/Tooltip","name":"Node_Noise.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"Node_Normal_Light.png","CopyToMask":-1,"filePath":"datafiles/data/Tooltip","name":"Node_Normal_Light.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"Node_Normal.png","CopyToMask":-1,"filePath":"datafiles/data/Tooltip","name":"Node_Normal.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"Node_Normalize.png","CopyToMask":-1,"filePath":"datafiles/data/Tooltip","name":"Node_Normalize.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"Node_Outline.png","CopyToMask":-1,"filePath":"datafiles/data/Tooltip","name":"Node_Outline.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"Node_Padding.png","CopyToMask":-1,"filePath":"datafiles/data/Tooltip","name":"Node_Padding.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"Node_Palette_Shift.png","CopyToMask":-1,"filePath":"datafiles/data/Tooltip","name":"Node_Palette_Shift.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"Node_Perlin.png","CopyToMask":-1,"filePath":"datafiles/data/Tooltip","name":"Node_Perlin.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"Node_Pixel_Cloud.png","CopyToMask":-1,"filePath":"datafiles/data/Tooltip","name":"Node_Pixel_Cloud.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"Node_Pixel_Sort.png","CopyToMask":-1,"filePath":"datafiles/data/Tooltip","name":"Node_Pixel_Sort.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"Node_Polar.png","CopyToMask":-1,"filePath":"datafiles/data/Tooltip","name":"Node_Polar.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"Node_Posterize.png","CopyToMask":-1,"filePath":"datafiles/data/Tooltip","name":"Node_Posterize.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"Node_Render_Sprite_Sheet.png","CopyToMask":-1,"filePath":"datafiles/data/Tooltip","name":"Node_Render_Sprite_Sheet.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"Node_Repeat.png","CopyToMask":-1,"filePath":"datafiles/data/Tooltip","name":"Node_Repeat.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"Node_Scale_Algo.png","CopyToMask":-1,"filePath":"datafiles/data/Tooltip","name":"Node_Scale_Algo.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"Node_Scale.png","CopyToMask":-1,"filePath":"datafiles/data/Tooltip","name":"Node_Scale.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"Node_Scatter.png","CopyToMask":-1,"filePath":"datafiles/data/Tooltip","name":"Node_Scatter.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"Node_SDF.png","CopyToMask":-1,"filePath":"datafiles/data/Tooltip","name":"Node_SDF.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"Node_Sequence_Anim.png","CopyToMask":-1,"filePath":"datafiles/data/Tooltip","name":"Node_Sequence_Anim.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"Node_Shadow_Cast.png","CopyToMask":-1,"filePath":"datafiles/data/Tooltip","name":"Node_Shadow_Cast.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"Node_Shadow.png","CopyToMask":-1,"filePath":"datafiles/data/Tooltip","name":"Node_Shadow.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"Node_Shape_Map.png","CopyToMask":-1,"filePath":"datafiles/data/Tooltip","name":"Node_Shape_Map.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"Node_Skew.png","CopyToMask":-1,"filePath":"datafiles/data/Tooltip","name":"Node_Skew.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"Node_Smear.png","CopyToMask":-1,"filePath":"datafiles/data/Tooltip","name":"Node_Smear.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"Node_Solid.png","CopyToMask":-1,"filePath":"datafiles/data/Tooltip","name":"Node_Solid.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"Node_Spherize.png","CopyToMask":-1,"filePath":"datafiles/data/Tooltip","name":"Node_Spherize.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"Node_Sprite_Stack.png","CopyToMask":-1,"filePath":"datafiles/data/Tooltip","name":"Node_Sprite_Stack.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"Node_Stack.png","CopyToMask":-1,"filePath":"datafiles/data/Tooltip","name":"Node_Stack.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"Node_Stripe.png","CopyToMask":-1,"filePath":"datafiles/data/Tooltip","name":"Node_Stripe.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"Node_Texture_Remap.png","CopyToMask":-1,"filePath":"datafiles/data/Tooltip","name":"Node_Texture_Remap.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"Node_Threshold.png","CopyToMask":-1,"filePath":"datafiles/data/Tooltip","name":"Node_Threshold.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"Node_Time_Remap.png","CopyToMask":-1,"filePath":"datafiles/data/Tooltip","name":"Node_Time_Remap.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"Node_Trail.png","CopyToMask":-1,"filePath":"datafiles/data/Tooltip","name":"Node_Trail.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"Node_Transform.png","CopyToMask":-1,"filePath":"datafiles/data/Tooltip","name":"Node_Transform.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"Node_Twirl.png","CopyToMask":-1,"filePath":"datafiles/data/Tooltip","name":"Node_Twirl.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"Node_Vignette.png","CopyToMask":-1,"filePath":"datafiles/data/Tooltip","name":"Node_Vignette.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"Node_Warp.png","CopyToMask":-1,"filePath":"datafiles/data/Tooltip","name":"Node_Warp.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"Node_Zigzag.png","CopyToMask":-1,"filePath":"datafiles/data/Tooltip","name":"Node_Zigzag.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"tooltips.afdesign","CopyToMask":-1,"filePath":"datafiles/data/Tooltip","name":"tooltips.afdesign","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"tooltips.afdesign~lock~","CopyToMask":-1,"filePath":"datafiles/data/Tooltip","name":"tooltips.afdesign~lock~","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"dllcredits.txt","ConfigValues":{ "Itch":{ "CopyToMask":"0", @@ -2177,6 +2290,7 @@ {"id":{"name":"s_add_24","path":"sprites/s_add_24/s_add_24.yy",},}, {"id":{"name":"s_add_32","path":"sprites/s_add_32/s_add_32.yy",},}, {"id":{"name":"s_add_64","path":"sprites/s_add_64/s_add_64.yy",},}, + {"id":{"name":"s_add_node_bg","path":"sprites/s_add_node_bg/s_add_node_bg.yy",},}, {"id":{"name":"s_add_node_search_high","path":"sprites/s_add_node_search_high/s_add_node_search_high.yy",},}, {"id":{"name":"s_addon_setting","path":"sprites/s_addon_setting/s_addon_setting.yy",},}, {"id":{"name":"s_addon","path":"sprites/s_addon/s_addon.yy",},}, @@ -2967,6 +3081,7 @@ {"id":{"name":"s_node_text","path":"sprites/s_node_text/s_node_text.yy",},}, {"id":{"name":"s_node_texture_map","path":"sprites/s_node_texture_map/s_node_texture_map.yy",},}, {"id":{"name":"s_node_threshold","path":"sprites/s_node_threshold/s_node_threshold.yy",},}, + {"id":{"name":"s_node_tile_random","path":"sprites/s_node_tile_random/s_node_tile_random.yy",},}, {"id":{"name":"s_node_time_map","path":"sprites/s_node_time_map/s_node_time_map.yy",},}, {"id":{"name":"s_node_timeline_preview","path":"sprites/s_node_timeline_preview/s_node_timeline_preview.yy",},}, {"id":{"name":"s_node_to_number","path":"sprites/s_node_to_number/s_node_to_number.yy",},}, diff --git a/datafiles/data/Theme.zip b/datafiles/data/Theme.zip index 831ebda74..35c3010ed 100644 Binary files a/datafiles/data/Theme.zip and b/datafiles/data/Theme.zip differ diff --git a/datafiles/data/Tooltip.zip b/datafiles/data/Tooltip.zip new file mode 100644 index 000000000..c81bd282a Binary files /dev/null and b/datafiles/data/Tooltip.zip differ diff --git a/datafiles/data/Tooltip/Node_2D_light.png b/datafiles/data/Tooltip/Node_2D_light.png new file mode 100644 index 000000000..ca1955480 Binary files /dev/null and b/datafiles/data/Tooltip/Node_2D_light.png differ diff --git a/datafiles/data/Tooltip/Node_9Slice.png b/datafiles/data/Tooltip/Node_9Slice.png new file mode 100644 index 000000000..950535fa6 Binary files /dev/null and b/datafiles/data/Tooltip/Node_9Slice.png differ diff --git a/datafiles/data/Tooltip/Node_Alpha_Cutoff.png b/datafiles/data/Tooltip/Node_Alpha_Cutoff.png new file mode 100644 index 000000000..603602425 Binary files /dev/null and b/datafiles/data/Tooltip/Node_Alpha_Cutoff.png differ diff --git a/datafiles/data/Tooltip/Node_Atlas.png b/datafiles/data/Tooltip/Node_Atlas.png new file mode 100644 index 000000000..b82e8e251 Binary files /dev/null and b/datafiles/data/Tooltip/Node_Atlas.png differ diff --git a/datafiles/data/Tooltip/Node_Average.png b/datafiles/data/Tooltip/Node_Average.png new file mode 100644 index 000000000..f4560f767 Binary files /dev/null and b/datafiles/data/Tooltip/Node_Average.png differ diff --git a/datafiles/data/Tooltip/Node_BW.png b/datafiles/data/Tooltip/Node_BW.png new file mode 100644 index 000000000..95281a84b Binary files /dev/null and b/datafiles/data/Tooltip/Node_BW.png differ diff --git a/datafiles/data/Tooltip/Node_Bend.png b/datafiles/data/Tooltip/Node_Bend.png new file mode 100644 index 000000000..f93fb7f49 Binary files /dev/null and b/datafiles/data/Tooltip/Node_Bend.png differ diff --git a/datafiles/data/Tooltip/Node_Bevel.png b/datafiles/data/Tooltip/Node_Bevel.png new file mode 100644 index 000000000..b9ad340cd Binary files /dev/null and b/datafiles/data/Tooltip/Node_Bevel.png differ diff --git a/datafiles/data/Tooltip/Node_Blend.png b/datafiles/data/Tooltip/Node_Blend.png new file mode 100644 index 000000000..f5d6bca3c Binary files /dev/null and b/datafiles/data/Tooltip/Node_Blend.png differ diff --git a/datafiles/data/Tooltip/Node_Blend_Edge.png b/datafiles/data/Tooltip/Node_Blend_Edge.png new file mode 100644 index 000000000..14931f39e Binary files /dev/null and b/datafiles/data/Tooltip/Node_Blend_Edge.png differ diff --git a/datafiles/data/Tooltip/Node_Blobify.png b/datafiles/data/Tooltip/Node_Blobify.png new file mode 100644 index 000000000..d6f34eab8 Binary files /dev/null and b/datafiles/data/Tooltip/Node_Blobify.png differ diff --git a/datafiles/data/Tooltip/Node_Bloom.png b/datafiles/data/Tooltip/Node_Bloom.png new file mode 100644 index 000000000..24efca6d1 Binary files /dev/null and b/datafiles/data/Tooltip/Node_Bloom.png differ diff --git a/datafiles/data/Tooltip/Node_Blur.png b/datafiles/data/Tooltip/Node_Blur.png new file mode 100644 index 000000000..2ffb839c2 Binary files /dev/null and b/datafiles/data/Tooltip/Node_Blur.png differ diff --git a/datafiles/data/Tooltip/Node_Blur_Bokeh.png b/datafiles/data/Tooltip/Node_Blur_Bokeh.png new file mode 100644 index 000000000..9ccdd84c2 Binary files /dev/null and b/datafiles/data/Tooltip/Node_Blur_Bokeh.png differ diff --git a/datafiles/data/Tooltip/Node_Blur_Contrast.png b/datafiles/data/Tooltip/Node_Blur_Contrast.png new file mode 100644 index 000000000..9c1335072 Binary files /dev/null and b/datafiles/data/Tooltip/Node_Blur_Contrast.png differ diff --git a/datafiles/data/Tooltip/Node_Blur_Directional.png b/datafiles/data/Tooltip/Node_Blur_Directional.png new file mode 100644 index 000000000..6d3c41574 Binary files /dev/null and b/datafiles/data/Tooltip/Node_Blur_Directional.png differ diff --git a/datafiles/data/Tooltip/Node_Blur_Path.png b/datafiles/data/Tooltip/Node_Blur_Path.png new file mode 100644 index 000000000..e113050fd Binary files /dev/null and b/datafiles/data/Tooltip/Node_Blur_Path.png differ diff --git a/datafiles/data/Tooltip/Node_Blur_Radial.png b/datafiles/data/Tooltip/Node_Blur_Radial.png new file mode 100644 index 000000000..7fcb58ba0 Binary files /dev/null and b/datafiles/data/Tooltip/Node_Blur_Radial.png differ diff --git a/datafiles/data/Tooltip/Node_Blur_Shape.png b/datafiles/data/Tooltip/Node_Blur_Shape.png new file mode 100644 index 000000000..42859d201 Binary files /dev/null and b/datafiles/data/Tooltip/Node_Blur_Shape.png differ diff --git a/datafiles/data/Tooltip/Node_Blur_Simple.png b/datafiles/data/Tooltip/Node_Blur_Simple.png new file mode 100644 index 000000000..32c2d633a Binary files /dev/null and b/datafiles/data/Tooltip/Node_Blur_Simple.png differ diff --git a/datafiles/data/Tooltip/Node_Blur_Zoom.png b/datafiles/data/Tooltip/Node_Blur_Zoom.png new file mode 100644 index 000000000..12af27320 Binary files /dev/null and b/datafiles/data/Tooltip/Node_Blur_Zoom.png differ diff --git a/datafiles/data/Tooltip/Node_Brush_Linear.png b/datafiles/data/Tooltip/Node_Brush_Linear.png new file mode 100644 index 000000000..c9b405843 Binary files /dev/null and b/datafiles/data/Tooltip/Node_Brush_Linear.png differ diff --git a/datafiles/data/Tooltip/Node_Camera.png b/datafiles/data/Tooltip/Node_Camera.png new file mode 100644 index 000000000..b4e1578af Binary files /dev/null and b/datafiles/data/Tooltip/Node_Camera.png differ diff --git a/datafiles/data/Tooltip/Node_Canvas.png b/datafiles/data/Tooltip/Node_Canvas.png new file mode 100644 index 000000000..58bb9c138 Binary files /dev/null and b/datafiles/data/Tooltip/Node_Canvas.png differ diff --git a/datafiles/data/Tooltip/Node_Cellular.png b/datafiles/data/Tooltip/Node_Cellular.png new file mode 100644 index 000000000..0d5ad3615 Binary files /dev/null and b/datafiles/data/Tooltip/Node_Cellular.png differ diff --git a/datafiles/data/Tooltip/Node_Checker.png b/datafiles/data/Tooltip/Node_Checker.png new file mode 100644 index 000000000..4508f7629 Binary files /dev/null and b/datafiles/data/Tooltip/Node_Checker.png differ diff --git a/datafiles/data/Tooltip/Node_Chromatic_Aberration.png b/datafiles/data/Tooltip/Node_Chromatic_Aberration.png new file mode 100644 index 000000000..92c85d2fc Binary files /dev/null and b/datafiles/data/Tooltip/Node_Chromatic_Aberration.png differ diff --git a/datafiles/data/Tooltip/Node_Color_Remove.png b/datafiles/data/Tooltip/Node_Color_Remove.png new file mode 100644 index 000000000..b47a90882 Binary files /dev/null and b/datafiles/data/Tooltip/Node_Color_Remove.png differ diff --git a/datafiles/data/Tooltip/Node_Color_adjust.png b/datafiles/data/Tooltip/Node_Color_adjust.png new file mode 100644 index 000000000..c84648e07 Binary files /dev/null and b/datafiles/data/Tooltip/Node_Color_adjust.png differ diff --git a/datafiles/data/Tooltip/Node_Color_replace.png b/datafiles/data/Tooltip/Node_Color_replace.png new file mode 100644 index 000000000..a856c6892 Binary files /dev/null and b/datafiles/data/Tooltip/Node_Color_replace.png differ diff --git a/datafiles/data/Tooltip/Node_Colorize.png b/datafiles/data/Tooltip/Node_Colorize.png new file mode 100644 index 000000000..1b9126eb2 Binary files /dev/null and b/datafiles/data/Tooltip/Node_Colorize.png differ diff --git a/datafiles/data/Tooltip/Node_Colors_Replace.png b/datafiles/data/Tooltip/Node_Colors_Replace.png new file mode 100644 index 000000000..ee96d7504 Binary files /dev/null and b/datafiles/data/Tooltip/Node_Colors_Replace.png differ diff --git a/datafiles/data/Tooltip/Node_Composite.png b/datafiles/data/Tooltip/Node_Composite.png new file mode 100644 index 000000000..8b2c2d263 Binary files /dev/null and b/datafiles/data/Tooltip/Node_Composite.png differ diff --git a/datafiles/data/Tooltip/Node_Convolution.png b/datafiles/data/Tooltip/Node_Convolution.png new file mode 100644 index 000000000..b7d50b01e Binary files /dev/null and b/datafiles/data/Tooltip/Node_Convolution.png differ diff --git a/datafiles/data/Tooltip/Node_Corner.png b/datafiles/data/Tooltip/Node_Corner.png new file mode 100644 index 000000000..f8d54c9d0 Binary files /dev/null and b/datafiles/data/Tooltip/Node_Corner.png differ diff --git a/datafiles/data/Tooltip/Node_Crop.png b/datafiles/data/Tooltip/Node_Crop.png new file mode 100644 index 000000000..171154b6c Binary files /dev/null and b/datafiles/data/Tooltip/Node_Crop.png differ diff --git a/datafiles/data/Tooltip/Node_Crop_Content.png b/datafiles/data/Tooltip/Node_Crop_Content.png new file mode 100644 index 000000000..36fa3e84c Binary files /dev/null and b/datafiles/data/Tooltip/Node_Crop_Content.png differ diff --git a/datafiles/data/Tooltip/Node_Curve.png b/datafiles/data/Tooltip/Node_Curve.png new file mode 100644 index 000000000..e3ae66d68 Binary files /dev/null and b/datafiles/data/Tooltip/Node_Curve.png differ diff --git a/datafiles/data/Tooltip/Node_Curve_HSV.png b/datafiles/data/Tooltip/Node_Curve_HSV.png new file mode 100644 index 000000000..760864021 Binary files /dev/null and b/datafiles/data/Tooltip/Node_Curve_HSV.png differ diff --git a/datafiles/data/Tooltip/Node_Dilate.png b/datafiles/data/Tooltip/Node_Dilate.png new file mode 100644 index 000000000..50f8b9d89 Binary files /dev/null and b/datafiles/data/Tooltip/Node_Dilate.png differ diff --git a/datafiles/data/Tooltip/Node_Displace.png b/datafiles/data/Tooltip/Node_Displace.png new file mode 100644 index 000000000..96b73484a Binary files /dev/null and b/datafiles/data/Tooltip/Node_Displace.png differ diff --git a/datafiles/data/Tooltip/Node_Dither.png b/datafiles/data/Tooltip/Node_Dither.png new file mode 100644 index 000000000..cef77a07f Binary files /dev/null and b/datafiles/data/Tooltip/Node_Dither.png differ diff --git a/datafiles/data/Tooltip/Node_Edge_Detect.png b/datafiles/data/Tooltip/Node_Edge_Detect.png new file mode 100644 index 000000000..80408845b Binary files /dev/null and b/datafiles/data/Tooltip/Node_Edge_Detect.png differ diff --git a/datafiles/data/Tooltip/Node_Erode.png b/datafiles/data/Tooltip/Node_Erode.png new file mode 100644 index 000000000..86130d9b2 Binary files /dev/null and b/datafiles/data/Tooltip/Node_Erode.png differ diff --git a/datafiles/data/Tooltip/Node_Export.png b/datafiles/data/Tooltip/Node_Export.png new file mode 100644 index 000000000..1ee021c1e Binary files /dev/null and b/datafiles/data/Tooltip/Node_Export.png differ diff --git a/datafiles/data/Tooltip/Node_FXAA.png b/datafiles/data/Tooltip/Node_FXAA.png new file mode 100644 index 000000000..dd64e4f67 Binary files /dev/null and b/datafiles/data/Tooltip/Node_FXAA.png differ diff --git a/datafiles/data/Tooltip/Node_Flip.png b/datafiles/data/Tooltip/Node_Flip.png new file mode 100644 index 000000000..52d55460a Binary files /dev/null and b/datafiles/data/Tooltip/Node_Flip.png differ diff --git a/datafiles/data/Tooltip/Node_Gamma_Map.png b/datafiles/data/Tooltip/Node_Gamma_Map.png new file mode 100644 index 000000000..0dafdd10a Binary files /dev/null and b/datafiles/data/Tooltip/Node_Gamma_Map.png differ diff --git a/datafiles/data/Tooltip/Node_Glow.png b/datafiles/data/Tooltip/Node_Glow.png new file mode 100644 index 000000000..13993bb14 Binary files /dev/null and b/datafiles/data/Tooltip/Node_Glow.png differ diff --git a/datafiles/data/Tooltip/Node_Gradient.png b/datafiles/data/Tooltip/Node_Gradient.png new file mode 100644 index 000000000..3e375b5cf Binary files /dev/null and b/datafiles/data/Tooltip/Node_Gradient.png differ diff --git a/datafiles/data/Tooltip/Node_Gradient_Points.png b/datafiles/data/Tooltip/Node_Gradient_Points.png new file mode 100644 index 000000000..49d5978a0 Binary files /dev/null and b/datafiles/data/Tooltip/Node_Gradient_Points.png differ diff --git a/datafiles/data/Tooltip/Node_Grain.png b/datafiles/data/Tooltip/Node_Grain.png new file mode 100644 index 000000000..e5a02b59c Binary files /dev/null and b/datafiles/data/Tooltip/Node_Grain.png differ diff --git a/datafiles/data/Tooltip/Node_Greyscale.png b/datafiles/data/Tooltip/Node_Greyscale.png new file mode 100644 index 000000000..07491afef Binary files /dev/null and b/datafiles/data/Tooltip/Node_Greyscale.png differ diff --git a/datafiles/data/Tooltip/Node_Grid.png b/datafiles/data/Tooltip/Node_Grid.png new file mode 100644 index 000000000..0d5847288 Binary files /dev/null and b/datafiles/data/Tooltip/Node_Grid.png differ diff --git a/datafiles/data/Tooltip/Node_Grid_Hex.png b/datafiles/data/Tooltip/Node_Grid_Hex.png new file mode 100644 index 000000000..56a37b7fe Binary files /dev/null and b/datafiles/data/Tooltip/Node_Grid_Hex.png differ diff --git a/datafiles/data/Tooltip/Node_Grid_Tri.png b/datafiles/data/Tooltip/Node_Grid_Tri.png new file mode 100644 index 000000000..d7d20a8e6 Binary files /dev/null and b/datafiles/data/Tooltip/Node_Grid_Tri.png differ diff --git a/datafiles/data/Tooltip/Node_Image.png b/datafiles/data/Tooltip/Node_Image.png new file mode 100644 index 000000000..27ffba663 Binary files /dev/null and b/datafiles/data/Tooltip/Node_Image.png differ diff --git a/datafiles/data/Tooltip/Node_Image_Animated.png b/datafiles/data/Tooltip/Node_Image_Animated.png new file mode 100644 index 000000000..ed06d2d89 Binary files /dev/null and b/datafiles/data/Tooltip/Node_Image_Animated.png differ diff --git a/datafiles/data/Tooltip/Node_Image_Sequence.png b/datafiles/data/Tooltip/Node_Image_Sequence.png new file mode 100644 index 000000000..f29cbc644 Binary files /dev/null and b/datafiles/data/Tooltip/Node_Image_Sequence.png differ diff --git a/datafiles/data/Tooltip/Node_Image_Sheet.png b/datafiles/data/Tooltip/Node_Image_Sheet.png new file mode 100644 index 000000000..a6f873517 Binary files /dev/null and b/datafiles/data/Tooltip/Node_Image_Sheet.png differ diff --git a/datafiles/data/Tooltip/Node_Image_gif.png b/datafiles/data/Tooltip/Node_Image_gif.png new file mode 100644 index 000000000..fd0e414c1 Binary files /dev/null and b/datafiles/data/Tooltip/Node_Image_gif.png differ diff --git a/datafiles/data/Tooltip/Node_Invert.png b/datafiles/data/Tooltip/Node_Invert.png new file mode 100644 index 000000000..429a370e9 Binary files /dev/null and b/datafiles/data/Tooltip/Node_Invert.png differ diff --git a/datafiles/data/Tooltip/Node_JPEG.png b/datafiles/data/Tooltip/Node_JPEG.png new file mode 100644 index 000000000..5a386541c Binary files /dev/null and b/datafiles/data/Tooltip/Node_JPEG.png differ diff --git a/datafiles/data/Tooltip/Node_Kuwahara.png b/datafiles/data/Tooltip/Node_Kuwahara.png new file mode 100644 index 000000000..237489b9a Binary files /dev/null and b/datafiles/data/Tooltip/Node_Kuwahara.png differ diff --git a/datafiles/data/Tooltip/Node_Level.png b/datafiles/data/Tooltip/Node_Level.png new file mode 100644 index 000000000..1e6e83374 Binary files /dev/null and b/datafiles/data/Tooltip/Node_Level.png differ diff --git a/datafiles/data/Tooltip/Node_Level_Selector.png b/datafiles/data/Tooltip/Node_Level_Selector.png new file mode 100644 index 000000000..5d496a5ea Binary files /dev/null and b/datafiles/data/Tooltip/Node_Level_Selector.png differ diff --git a/datafiles/data/Tooltip/Node_Line.png b/datafiles/data/Tooltip/Node_Line.png new file mode 100644 index 000000000..2e6427cdd Binary files /dev/null and b/datafiles/data/Tooltip/Node_Line.png differ diff --git a/datafiles/data/Tooltip/Node_Local_Analyze.png b/datafiles/data/Tooltip/Node_Local_Analyze.png new file mode 100644 index 000000000..ed1e32022 Binary files /dev/null and b/datafiles/data/Tooltip/Node_Local_Analyze.png differ diff --git a/datafiles/data/Tooltip/Node_Mesh_Warp.png b/datafiles/data/Tooltip/Node_Mesh_Warp.png new file mode 100644 index 000000000..fd64f5abc Binary files /dev/null and b/datafiles/data/Tooltip/Node_Mesh_Warp.png differ diff --git a/datafiles/data/Tooltip/Node_Mirror.png b/datafiles/data/Tooltip/Node_Mirror.png new file mode 100644 index 000000000..112e9bf9d Binary files /dev/null and b/datafiles/data/Tooltip/Node_Mirror.png differ diff --git a/datafiles/data/Tooltip/Node_Noise.png b/datafiles/data/Tooltip/Node_Noise.png new file mode 100644 index 000000000..65fa7e7b6 Binary files /dev/null and b/datafiles/data/Tooltip/Node_Noise.png differ diff --git a/datafiles/data/Tooltip/Node_Noise_Aniso.png b/datafiles/data/Tooltip/Node_Noise_Aniso.png new file mode 100644 index 000000000..25ad8dda7 Binary files /dev/null and b/datafiles/data/Tooltip/Node_Noise_Aniso.png differ diff --git a/datafiles/data/Tooltip/Node_Noise_Simplex.png b/datafiles/data/Tooltip/Node_Noise_Simplex.png new file mode 100644 index 000000000..6d94f64de Binary files /dev/null and b/datafiles/data/Tooltip/Node_Noise_Simplex.png differ diff --git a/datafiles/data/Tooltip/Node_Normal.png b/datafiles/data/Tooltip/Node_Normal.png new file mode 100644 index 000000000..d10fdc675 Binary files /dev/null and b/datafiles/data/Tooltip/Node_Normal.png differ diff --git a/datafiles/data/Tooltip/Node_Normal_Light.png b/datafiles/data/Tooltip/Node_Normal_Light.png new file mode 100644 index 000000000..44d4bd00e Binary files /dev/null and b/datafiles/data/Tooltip/Node_Normal_Light.png differ diff --git a/datafiles/data/Tooltip/Node_Normalize.png b/datafiles/data/Tooltip/Node_Normalize.png new file mode 100644 index 000000000..c99459565 Binary files /dev/null and b/datafiles/data/Tooltip/Node_Normalize.png differ diff --git a/datafiles/data/Tooltip/Node_Outline.png b/datafiles/data/Tooltip/Node_Outline.png new file mode 100644 index 000000000..bc6406315 Binary files /dev/null and b/datafiles/data/Tooltip/Node_Outline.png differ diff --git a/datafiles/data/Tooltip/Node_Padding.png b/datafiles/data/Tooltip/Node_Padding.png new file mode 100644 index 000000000..d446a9fc7 Binary files /dev/null and b/datafiles/data/Tooltip/Node_Padding.png differ diff --git a/datafiles/data/Tooltip/Node_Palette_Shift.png b/datafiles/data/Tooltip/Node_Palette_Shift.png new file mode 100644 index 000000000..9764e907f Binary files /dev/null and b/datafiles/data/Tooltip/Node_Palette_Shift.png differ diff --git a/datafiles/data/Tooltip/Node_Perlin.png b/datafiles/data/Tooltip/Node_Perlin.png new file mode 100644 index 000000000..aef0eda11 Binary files /dev/null and b/datafiles/data/Tooltip/Node_Perlin.png differ diff --git a/datafiles/data/Tooltip/Node_Pixel_Cloud.png b/datafiles/data/Tooltip/Node_Pixel_Cloud.png new file mode 100644 index 000000000..6d69fe041 Binary files /dev/null and b/datafiles/data/Tooltip/Node_Pixel_Cloud.png differ diff --git a/datafiles/data/Tooltip/Node_Pixel_Sort.png b/datafiles/data/Tooltip/Node_Pixel_Sort.png new file mode 100644 index 000000000..b5c39232c Binary files /dev/null and b/datafiles/data/Tooltip/Node_Pixel_Sort.png differ diff --git a/datafiles/data/Tooltip/Node_Polar.png b/datafiles/data/Tooltip/Node_Polar.png new file mode 100644 index 000000000..5ef3cd568 Binary files /dev/null and b/datafiles/data/Tooltip/Node_Polar.png differ diff --git a/datafiles/data/Tooltip/Node_Posterize.png b/datafiles/data/Tooltip/Node_Posterize.png new file mode 100644 index 000000000..f4aa8d5a6 Binary files /dev/null and b/datafiles/data/Tooltip/Node_Posterize.png differ diff --git a/datafiles/data/Tooltip/Node_Render_Sprite_Sheet.png b/datafiles/data/Tooltip/Node_Render_Sprite_Sheet.png new file mode 100644 index 000000000..ce9fe85ab Binary files /dev/null and b/datafiles/data/Tooltip/Node_Render_Sprite_Sheet.png differ diff --git a/datafiles/data/Tooltip/Node_Repeat.png b/datafiles/data/Tooltip/Node_Repeat.png new file mode 100644 index 000000000..258c26f8a Binary files /dev/null and b/datafiles/data/Tooltip/Node_Repeat.png differ diff --git a/datafiles/data/Tooltip/Node_SDF.png b/datafiles/data/Tooltip/Node_SDF.png new file mode 100644 index 000000000..eec696e59 Binary files /dev/null and b/datafiles/data/Tooltip/Node_SDF.png differ diff --git a/datafiles/data/Tooltip/Node_Scale.png b/datafiles/data/Tooltip/Node_Scale.png new file mode 100644 index 000000000..f1389211d Binary files /dev/null and b/datafiles/data/Tooltip/Node_Scale.png differ diff --git a/datafiles/data/Tooltip/Node_Scale_Algo.png b/datafiles/data/Tooltip/Node_Scale_Algo.png new file mode 100644 index 000000000..2c9e8c7e3 Binary files /dev/null and b/datafiles/data/Tooltip/Node_Scale_Algo.png differ diff --git a/datafiles/data/Tooltip/Node_Scatter.png b/datafiles/data/Tooltip/Node_Scatter.png new file mode 100644 index 000000000..408896193 Binary files /dev/null and b/datafiles/data/Tooltip/Node_Scatter.png differ diff --git a/datafiles/data/Tooltip/Node_Sequence_Anim.png b/datafiles/data/Tooltip/Node_Sequence_Anim.png new file mode 100644 index 000000000..f65da4c87 Binary files /dev/null and b/datafiles/data/Tooltip/Node_Sequence_Anim.png differ diff --git a/datafiles/data/Tooltip/Node_Shadow.png b/datafiles/data/Tooltip/Node_Shadow.png new file mode 100644 index 000000000..ed4f6f736 Binary files /dev/null and b/datafiles/data/Tooltip/Node_Shadow.png differ diff --git a/datafiles/data/Tooltip/Node_Shadow_Cast.png b/datafiles/data/Tooltip/Node_Shadow_Cast.png new file mode 100644 index 000000000..3fca7be99 Binary files /dev/null and b/datafiles/data/Tooltip/Node_Shadow_Cast.png differ diff --git a/datafiles/data/Tooltip/Node_Shape_Map.png b/datafiles/data/Tooltip/Node_Shape_Map.png new file mode 100644 index 000000000..28604c890 Binary files /dev/null and b/datafiles/data/Tooltip/Node_Shape_Map.png differ diff --git a/datafiles/data/Tooltip/Node_Skew.png b/datafiles/data/Tooltip/Node_Skew.png new file mode 100644 index 000000000..6bdc7cc6e Binary files /dev/null and b/datafiles/data/Tooltip/Node_Skew.png differ diff --git a/datafiles/data/Tooltip/Node_Smear.png b/datafiles/data/Tooltip/Node_Smear.png new file mode 100644 index 000000000..215e7fe54 Binary files /dev/null and b/datafiles/data/Tooltip/Node_Smear.png differ diff --git a/datafiles/data/Tooltip/Node_Solid.png b/datafiles/data/Tooltip/Node_Solid.png new file mode 100644 index 000000000..17dcbb9ce Binary files /dev/null and b/datafiles/data/Tooltip/Node_Solid.png differ diff --git a/datafiles/data/Tooltip/Node_Spherize.png b/datafiles/data/Tooltip/Node_Spherize.png new file mode 100644 index 000000000..b8eb74a5e Binary files /dev/null and b/datafiles/data/Tooltip/Node_Spherize.png differ diff --git a/datafiles/data/Tooltip/Node_Sprite_Stack.png b/datafiles/data/Tooltip/Node_Sprite_Stack.png new file mode 100644 index 000000000..5efe4c524 Binary files /dev/null and b/datafiles/data/Tooltip/Node_Sprite_Stack.png differ diff --git a/datafiles/data/Tooltip/Node_Stack.png b/datafiles/data/Tooltip/Node_Stack.png new file mode 100644 index 000000000..db1f936a0 Binary files /dev/null and b/datafiles/data/Tooltip/Node_Stack.png differ diff --git a/datafiles/data/Tooltip/Node_Stripe.png b/datafiles/data/Tooltip/Node_Stripe.png new file mode 100644 index 000000000..1d9c1b554 Binary files /dev/null and b/datafiles/data/Tooltip/Node_Stripe.png differ diff --git a/datafiles/data/Tooltip/Node_Texture_Remap.png b/datafiles/data/Tooltip/Node_Texture_Remap.png new file mode 100644 index 000000000..1995c6e1b Binary files /dev/null and b/datafiles/data/Tooltip/Node_Texture_Remap.png differ diff --git a/datafiles/data/Tooltip/Node_Threshold.png b/datafiles/data/Tooltip/Node_Threshold.png new file mode 100644 index 000000000..c5d4f5232 Binary files /dev/null and b/datafiles/data/Tooltip/Node_Threshold.png differ diff --git a/datafiles/data/Tooltip/Node_Time_Remap.png b/datafiles/data/Tooltip/Node_Time_Remap.png new file mode 100644 index 000000000..fd9d00181 Binary files /dev/null and b/datafiles/data/Tooltip/Node_Time_Remap.png differ diff --git a/datafiles/data/Tooltip/Node_Trail.png b/datafiles/data/Tooltip/Node_Trail.png new file mode 100644 index 000000000..c98e378b9 Binary files /dev/null and b/datafiles/data/Tooltip/Node_Trail.png differ diff --git a/datafiles/data/Tooltip/Node_Transform.png b/datafiles/data/Tooltip/Node_Transform.png new file mode 100644 index 000000000..0adb84707 Binary files /dev/null and b/datafiles/data/Tooltip/Node_Transform.png differ diff --git a/datafiles/data/Tooltip/Node_Twirl.png b/datafiles/data/Tooltip/Node_Twirl.png new file mode 100644 index 000000000..0374a10f2 Binary files /dev/null and b/datafiles/data/Tooltip/Node_Twirl.png differ diff --git a/datafiles/data/Tooltip/Node_Vignette.png b/datafiles/data/Tooltip/Node_Vignette.png new file mode 100644 index 000000000..76a85832a Binary files /dev/null and b/datafiles/data/Tooltip/Node_Vignette.png differ diff --git a/datafiles/data/Tooltip/Node_Warp.png b/datafiles/data/Tooltip/Node_Warp.png new file mode 100644 index 000000000..1c2cf6487 Binary files /dev/null and b/datafiles/data/Tooltip/Node_Warp.png differ diff --git a/datafiles/data/Tooltip/Node_Zigzag.png b/datafiles/data/Tooltip/Node_Zigzag.png new file mode 100644 index 000000000..64ff218a5 Binary files /dev/null and b/datafiles/data/Tooltip/Node_Zigzag.png differ diff --git a/datafiles/data/Tooltip/tooltips.afdesign b/datafiles/data/Tooltip/tooltips.afdesign new file mode 100644 index 000000000..b4b47a10a Binary files /dev/null and b/datafiles/data/Tooltip/tooltips.afdesign differ diff --git a/datafiles/data/Tooltip/tooltips.afdesign~lock~ b/datafiles/data/Tooltip/tooltips.afdesign~lock~ new file mode 100644 index 000000000..73b3e9c35 Binary files /dev/null and b/datafiles/data/Tooltip/tooltips.afdesign~lock~ differ diff --git a/datafiles/data/Tooltip/~$tooltips.afdesign~tmp b/datafiles/data/Tooltip/~$tooltips.afdesign~tmp new file mode 100644 index 000000000..6533870fa Binary files /dev/null and b/datafiles/data/Tooltip/~$tooltips.afdesign~tmp differ diff --git a/datafiles/data/tooltip.zip b/datafiles/data/tooltip.zip deleted file mode 100644 index c24e55aec..000000000 Binary files a/datafiles/data/tooltip.zip and /dev/null differ diff --git a/objects/o_dialog_add_node/Create_0.gml b/objects/o_dialog_add_node/Create_0.gml index c6fb18c85..503ab7bb1 100644 --- a/objects/o_dialog_add_node/Create_0.gml +++ b/objects/o_dialog_add_node/Create_0.gml @@ -37,6 +37,8 @@ event_inherited(); is_global = PANEL_GRAPH.getCurrentContext() == noone; + tooltip_surface = -1; + #region ---- category ---- category = NODE_CATEGORY; switch(instanceof(context)) { @@ -509,7 +511,7 @@ event_inherited(); rightClick(_node); } - if(_node.getTooltip() != "") { + if(_node.getTooltip() != "" || _node.tooltip_spr != noone) { if(point_in_rectangle(_m[0], _m[1], _boxx, yy, _boxx + ui(16), yy + ui(16))) { draw_sprite_ui_uniform(THEME.info, 0, _boxx + ui(8), yy + ui(8), 0.7, COLORS._main_icon, 1.0); node_tooltip = _node; @@ -624,7 +626,7 @@ event_inherited(); } if(_hoverContent && point_in_rectangle(_m[0], _m[1], 0, yy, list_width, yy + list_height - 1)) { - if(_node.getTooltip() != "") { + if(_node.getTooltip() != "" || _node.tooltip_spr != noone) { node_tooltip = _node; node_tooltip_x = content_pane.x + ui(16); node_tooltip_y = content_pane.y + yy @@ -700,6 +702,8 @@ event_inherited(); content_pane.always_scroll = true; + + #region ---- set page ---- function setPage(pageIndex) { ADD_NODE_PAGE = min(pageIndex, ds_list_size(category) - 1); @@ -714,7 +718,6 @@ event_inherited(); setPage(ADD_NODE_PAGE); #endregion - #endregion #region resize @@ -886,7 +889,7 @@ event_inherited(); buildNode(_node, _param); } - if(struct_has(_node, "tooltip") && _node.getTooltip() != "") { + if(struct_has(_node, "tooltip") && (_node.getTooltip() != "" || _node.tooltip_spr != noone)) { if(point_in_rectangle(_m[0], _m[1], _boxx, yy, _boxx + ui(16), yy + ui(16))) { draw_sprite_ui_uniform(THEME.info, 0, _boxx + ui(8), yy + ui(8), 0.7, COLORS._main_icon, 1.0); node_tooltip = _node; @@ -1002,7 +1005,7 @@ event_inherited(); } if(_hover && point_in_rectangle(_m[0], _m[1], 0, yy, list_width, yy + list_height - 1)) { - if(struct_has(_node, "tooltip") && _node.getTooltip() != "") { + if(struct_has(_node, "tooltip") && (_node.getTooltip() != "" || _node.tooltip_spr != noone)) { node_tooltip = _node; node_tooltip_x = search_pane.x + 0; node_tooltip_y = search_pane.y + yy diff --git a/objects/o_dialog_add_node/Draw_64.gml b/objects/o_dialog_add_node/Draw_64.gml index 2c24163aa..5188ffe1f 100644 --- a/objects/o_dialog_add_node/Draw_64.gml +++ b/objects/o_dialog_add_node/Draw_64.gml @@ -77,25 +77,39 @@ if !ready exit; var spr = node_tooltip.tooltip_spr; draw_set_font(f_p1); + var _th = string_height_ext(txt, -1, ww - ui(16)); if(spr) { - ww = ui(8) + sprite_get_width(spr); - hh = ui(8) + sprite_get_height(spr); + ww = sprite_get_width(spr); + hh = sprite_get_height(spr) + (_th - ui(8)) * (txt != ""); } else hh = ui(16) + string_height_ext(txt, -1, ww - ui(16)); + tooltip_surface = surface_verify(tooltip_surface, ww, hh); + surface_set_shader(tooltip_surface, noone); + draw_set_text(f_p1, fa_left, fa_bottom, COLORS._main_text) + + if(spr) { + draw_sprite(spr, 0, 0, 0); + + BLEND_NORMAL + if(txt != "") draw_sprite_stretched_ext(THEME.add_node_bg, 0, 0, hh - _th - 32, ww, _th + 32, CDEF.main_dkblack); + } else + draw_clear_alpha(c_white, 0); + + draw_text_ext_add(ui(8), hh - ui(8), txt, -1, ww - ui(16)); + + BLEND_MULTIPLY + draw_sprite_stretched(THEME.ui_panel_bg, 4, 0, 0, ww, hh); + BLEND_NORMAL + surface_reset_shader(); + var x0 = min(node_tooltip_x, WIN_W - ww - ui(8)); - var x1 = node_tooltip_x + ww; - var y1 = node_tooltip_y - ui(8); - var y0 = y1 - hh; + var y0 = node_tooltip_y - hh - ui(8); draw_sprite_stretched(THEME.textbox, 3, x0, y0, ww, hh); + draw_surface(tooltip_surface, x0, y0); draw_sprite_stretched(THEME.textbox, 0, x0, y0, ww, hh); - - if(spr) draw_sprite(spr, 0, x0 + ui(4), y0 + ui(4)); - - draw_set_text(f_p1, fa_left, fa_bottom, COLORS._main_text) - draw_text_line(x0 + ui(8), y1 - ui(8), txt, -1, ww - ui(16)); } node_tooltip = noone; diff --git a/scripts/assets_data/assets_data.gml b/scripts/assets_data/assets_data.gml index 464bb4e24..ec7d044ce 100644 --- a/scripts/assets_data/assets_data.gml +++ b/scripts/assets_data/assets_data.gml @@ -3,7 +3,6 @@ global.ASSET_CACHE = ds_map_create(); function __initAssets() { - global.ASSETS = new DirectoryObject("Assets", ""); ds_map_clear(global.ASSET_MAP); var root = DIRECTORY + "Assets"; @@ -12,9 +11,16 @@ if(check_version($"{root}/version")) zip_unzip("data/Assets.zip", root); - __initAssetsFolder(root); - for( var i = 0, n = array_length(PREFERENCES.path_assets); i < n; i++ ) - __initAssetsFolder(PREFERENCES.path_assets[i]); + if(array_empty(PREFERENCES.path_assets)) { + global.ASSETS = __initAssetsFolder(root); + + } else { + global.ASSETS = new DirectoryObject("Assets", ""); + + ds_list_add(global.ASSETS.subDir, __initAssetsFolder(root)); + for( var i = 0, n = array_length(PREFERENCES.path_assets); i < n; i++ ) + ds_list_add(global.ASSETS.subDir, __initAssetsFolder(PREFERENCES.path_assets[i])); + } } function __initAssetsFolder(_dir) { @@ -22,8 +28,6 @@ var _folder = new DirectoryObject(filename_name_only(_dir), _dir); _folder.scan([".png"]); _folder.open = true; - - ds_list_add(global.ASSETS.subDir, _folder); var st = ds_stack_create(); ds_stack_push(st, _folder); @@ -42,6 +46,8 @@ } ds_stack_destroy(st); + + return _folder; } function get_asset(key) { diff --git a/scripts/globals/globals.gml b/scripts/globals/globals.gml index 42b3cdb07..3a17179d6 100644 --- a/scripts/globals/globals.gml +++ b/scripts/globals/globals.gml @@ -38,7 +38,7 @@ LATEST_VERSION = 11700; VERSION = 11770; SAVE_VERSION = 11700; - VERSION_STRING = "1.17.8.004"; + VERSION_STRING = "1.17.8.005"; BUILD_NUMBER = 11770; globalvar HOTKEYS, HOTKEY_CONTEXT; diff --git a/scripts/node_bend/node_bend.gml b/scripts/node_bend/node_bend.gml index f7b683bfe..0a64f36a6 100644 --- a/scripts/node_bend/node_bend.gml +++ b/scripts/node_bend/node_bend.gml @@ -32,14 +32,14 @@ function Node_Bend(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) cons attribute_surface_depth(); attribute_interpolation(); - static step = function() { #region + static step = function() { var _typ = getInputData(2); inputs[| 5].setVisible(_typ == 1); inputs[| 6].setVisible(_typ == 1); - } #endregion + } - static processData = function(_outSurf, _data, _output_index, _array_index) { #region + static processData = function(_outSurf, _data, _output_index, _array_index) { var _surf = _data[0]; var _typ = _data[2]; var _axs = _data[3]; @@ -227,6 +227,8 @@ function Node_Bend(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) cons break; } + if(_maxx == undefined) return _outSurf; + #region render for( var i = 0; i < array_length(mesh); i++ ) { var _t = mesh[i]; @@ -248,6 +250,7 @@ function Node_Bend(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) cons var n = array_length(mesh); + gpu_set_texfilter(attributes.interpolate); for( var k = 0; k < n; k += 100 ) { draw_primitive_begin_texture(pr_trianglelist, surface_get_texture(_surf)); @@ -261,9 +264,10 @@ function Node_Bend(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) cons draw_primitive_end(); } + gpu_set_texfilter(false); surface_reset_shader(); #endregion return _outSurf; - } #endregion + } } \ No newline at end of file diff --git a/scripts/node_brush_linear/node_brush_linear.gml b/scripts/node_brush_linear/node_brush_linear.gml index a72c994b5..84abb5a69 100644 --- a/scripts/node_brush_linear/node_brush_linear.gml +++ b/scripts/node_brush_linear/node_brush_linear.gml @@ -20,16 +20,30 @@ function Node_Brush_Linear(_x, _y, _group = noone) : Node_Processor(_x, _y, _gro inputs[| 6] = nodeValue("Circulation", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.8) .setDisplay(VALUE_DISPLAY.slider); + inputs[| 7] = nodeValue("Mask", self, JUNCTION_CONNECT.input, VALUE_TYPE.surface, noone); + + inputs[| 8] = nodeValue("Mix", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + .setDisplay(VALUE_DISPLAY.slider); + + inputs[| 9] = nodeValue("Channel", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 0b1111) + .setDisplay(VALUE_DISPLAY.toggle, { data: array_create(4, THEME.inspector_channel) }); + + __init_mask_modifier(7); // inputs 10, 11 + outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); input_display_list = [ 1, - ["Surface", false], 0, + ["Surface", false], 0, 7, 8, 9, 10, 11, ["Effect", false], 2, 4, 5, 6, ]; attribute_surface_depth(); - static processData = function(_outSurf, _data, _output_index, _array_index) { #region + static step = function() { + __step_mask_modifier(); + } + + static processData = function(_outSurf, _data, _output_index, _array_index) { surface_set_shader(_outSurf, sh_brush_linear); shader_set_f("dimension", surface_get_dimension(_data[0])); @@ -42,6 +56,10 @@ function Node_Brush_Linear(_x, _y, _group = noone) : Node_Processor(_x, _y, _gro draw_surface_safe(_data[0]); surface_reset_shader(); + __process_mask_modifier(_data); + _outSurf = mask_apply(_data[0], _outSurf, _data[7], _data[8]); + _outSurf = channel_apply(_data[0], _outSurf, _data[9]); + return _outSurf; - } #endregion + } } \ No newline at end of file diff --git a/scripts/node_guide/node_guide.gml b/scripts/node_guide/node_guide.gml index 9b3768d64..4be2db615 100644 --- a/scripts/node_guide/node_guide.gml +++ b/scripts/node_guide/node_guide.gml @@ -150,7 +150,7 @@ function __initNodeData() { directory_verify(nodeDir); if(check_version($"{nodeDir}version")) { - zip_unzip("data/tooltip.zip", nodeDir); + zip_unzip("data/Tooltip.zip", nodeDir); file_delete(nodeDir + "nodes.json"); file_copy_override("data/nodes.json", nodeDir + "nodes.json"); diff --git a/scripts/node_kuwahara/node_kuwahara.gml b/scripts/node_kuwahara/node_kuwahara.gml index e8ea00d5b..8796936ef 100644 --- a/scripts/node_kuwahara/node_kuwahara.gml +++ b/scripts/node_kuwahara/node_kuwahara.gml @@ -9,13 +9,33 @@ function Node_Kuwahara(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) inputs[| 2] = nodeValue("Radius", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 2) .setValidator(VV_min(1)); + inputs[| 3] = nodeValue("Mask", self, JUNCTION_CONNECT.input, VALUE_TYPE.surface, noone); + + inputs[| 4] = nodeValue("Mix", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + .setDisplay(VALUE_DISPLAY.slider); + + inputs[| 5] = nodeValue("Active", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + active_index = 5; + + inputs[| 6] = nodeValue("Channel", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 0b1111) + .setDisplay(VALUE_DISPLAY.toggle, { data: array_create(4, THEME.inspector_channel) }); + + __init_mask_modifier(3); // inputs 7, 8 + outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); - input_display_list = [ 1, 0, 2 ]; + input_display_list = [ 1, + ["Surfaces", true], 0, 3, 4, 7, 8, + ["Effects", true], 2 + ]; attribute_surface_depth(); - static processData = function(_outSurf, _data, _output_index, _array_index) { #region + static step = function() { + __step_mask_modifier(); + } + + static processData = function(_outSurf, _data, _output_index, _array_index) { surface_set_shader(_outSurf, sh_kuwahara); shader_set_f("dimension", surface_get_dimension(_data[0])); @@ -24,6 +44,10 @@ function Node_Kuwahara(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) draw_surface_safe(_data[0]); surface_reset_shader(); + __process_mask_modifier(_data); + _outSurf = mask_apply(_data[0], _outSurf, _data[3], _data[4]); + _outSurf = channel_apply(_data[0], _outSurf, _data[6]); + return _outSurf; - } #endregion + } } \ No newline at end of file diff --git a/scripts/node_normalize/node_normalize.gml b/scripts/node_normalize/node_normalize.gml index 91b4bc0a0..89b29f8dc 100644 --- a/scripts/node_normalize/node_normalize.gml +++ b/scripts/node_normalize/node_normalize.gml @@ -14,11 +14,11 @@ function Node_Normalize(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) temp_surface = [ surface_create(1, 1), surface_create(1, 1), surface_create(1, 1), surface_create(1, 1) ]; - static step = function() { #region + static step = function() { - } #endregion + } - static processData = function(_outSurf, _data, _output_index, _array_index) { #region + static processData = function(_outSurf, _data, _output_index, _array_index) { var _surf = _data[0]; var _mode = _data[1]; @@ -90,23 +90,22 @@ function Node_Normalize(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) } buffer_delete(_bMax); buffer_delete(_bMin); - #endregion - if(_mode == 0) { - var _bmax = (_max[0] + _max[1] + _max[2]) / 2; - var _bmin = (_min[0] + _min[1] + _min[2]) / 2; + if(_mode == 0) { + var _bmax = (_max[0] + _max[1] + _max[2]) / 3; + var _bmin = (_min[0] + _min[1] + _min[2]) / 3; + + _max = [ _bmax, _bmax, _bmax ]; + _min = [ _bmin, _bmin, _bmin ]; + } - _max = [ _bmax, _bmax, _bmax ]; - _min = [ _bmin, _bmin, _bmin ]; - } - - surface_set_shader(_outSurf, sh_normalize); - shader_set_f("cMax", _max); - shader_set_f("cMin", _min); - - draw_surface_safe(_surf); - surface_reset_shader(); + surface_set_shader(_outSurf, sh_normalize); + shader_set_f("cMax", _max); + shader_set_f("cMin", _min); + + draw_surface_safe(_surf); + surface_reset_shader(); return _outSurf; - } #endregion + } } \ No newline at end of file diff --git a/scripts/node_palette_shift/node_palette_shift.gml b/scripts/node_palette_shift/node_palette_shift.gml index 47f04f47e..d5110a2f7 100644 --- a/scripts/node_palette_shift/node_palette_shift.gml +++ b/scripts/node_palette_shift/node_palette_shift.gml @@ -43,8 +43,8 @@ function Node_Palette_Shift(_x, _y, _group = noone) : Node_Processor(_x, _y, _gr for(var i = 0; i < array_length(_pal); i++) array_append(_colors, colToVec4(_pal[i])); - inputs[| 2].editWidget.minn = -array_length(_pal); - inputs[| 2].editWidget.maxx = array_length(_pal); + inputs[| 2].editWidget.slide_range[0] = -array_length(_pal); + inputs[| 2].editWidget.slide_range[1] = array_length(_pal); surface_set_shader(_outSurf, sh_palette_shift); shader_set_f("palette", _colors); diff --git a/scripts/node_registry/node_registry.gml b/scripts/node_registry/node_registry.gml index 827ea7ccc..fb71ee93f 100644 --- a/scripts/node_registry/node_registry.gml +++ b/scripts/node_registry/node_registry.gml @@ -20,7 +20,7 @@ function NodeObject(_name, _spr, _node, _create, tooltip = "", tags = []) constr is_patreon_extra = false; if(!IS_CMD) { - var pth = DIRECTORY + "Nodes/tooltip/" + node + ".png"; + var pth = DIRECTORY + $"Nodes/Tooltip/{node}.png"; if(file_exists_empty(pth)) tooltip_spr = sprite_add(pth, 0, false, false, 0, 0); if(struct_has(global.NODE_GUIDE, node)) { @@ -537,7 +537,7 @@ function __initNodes() { ds_list_add(transform, "Warps"); addNodeObject(transform, "Crop", s_node_crop, "Node_Crop", [1, Node_Crop],, "Crop out image to create smaller ones."); addNodeObject(transform, "Crop Content", s_node_crop_content, "Node_Crop_Content", [1, Node_Crop_Content],, "Crop out empty pixel from the image."); - addNodeObject(transform, "Bend", s_node_bend, "Node_Bend", [1, Node_Bend], ["wrap"]).setVersion(11650); + addNodeObject(transform, "Bend", s_node_bend, "Node_Bend", [1, Node_Bend], ["wrap"], "Warp an image into a predefined shape.").setVersion(11650); addNodeObject(transform, "Warp", s_node_warp, "Node_Warp", [1, Node_Warp], ["warp corner"], "Warp image by freely moving the corners."); addNodeObject(transform, "Skew", s_node_skew, "Node_Skew", [1, Node_Skew], ["shear"], "Skew image horizontally, or vertically."); addNodeObject(transform, "Mesh Warp", s_node_warp_mesh, "Node_Mesh_Warp", [1, Node_Mesh_Warp], ["mesh wrap"], "Wrap image by converting it to mesh, and using control points."); @@ -548,7 +548,7 @@ function __initNodes() { addNodeObject(transform, "Composite", s_node_compose, "Node_Composite", [1, Node_Composite], ["merge"], "Combine multiple images with controllable position, rotation, scale."); addNodeObject(transform, "Nine Slice", s_node_9patch, "Node_9Slice", [1, Node_9Slice], ["9 slice", "splice"], "Cut image into 3x3 parts, and scale/repeat only the middle part."); addNodeObject(transform, "Padding", s_node_padding, "Node_Padding", [1, Node_Padding],, "Make image bigger by adding space in 4 directions."); - addNodeObject(transform, "Tile Random", s_node_padding, "Node_Tile_Random", [1, Node_Tile_Random]); + addNodeObject(transform, "Tile Random", s_node_tile_random, "Node_Tile_Random", [1, Node_Tile_Random]).setVersion(11780); #endregion var filter = ds_list_create(); #region //filter diff --git a/scripts/theme_definition/theme_definition.gml b/scripts/theme_definition/theme_definition.gml index e5010e0d3..84af7a7b6 100644 --- a/scripts/theme_definition/theme_definition.gml +++ b/scripts/theme_definition/theme_definition.gml @@ -313,6 +313,7 @@ function Theme() constructor { ui_selection_range_sim_hori = s_ui_selection_range_sim_hori; ui_selection = s_ui_selection; ui_panel_selection = s_ui_panel_selection; + add_node_bg = s_add_node_bg; anchor_arrow = s_anchor_arrow; anchor_bone_stick = s_anchor_bone_stick; diff --git a/shaders/sh_pixel_cloud/sh_pixel_cloud.fsh b/shaders/sh_pixel_cloud/sh_pixel_cloud.fsh index c38a64863..a75a20d9c 100644 --- a/shaders/sh_pixel_cloud/sh_pixel_cloud.fsh +++ b/shaders/sh_pixel_cloud/sh_pixel_cloud.fsh @@ -66,11 +66,23 @@ float eval_curve_segment_x(in float _y0, in float ax0, in float ay0, in float bx } #endregion float curveEval(in float _x) { #region + + int _shf = int(mod(float(curve_amount), 6.)); + float shift = 0.; + float scale = 1.; + + if(_shf > 0) { + shift = alpha_curve[0]; + scale = alpha_curve[1]; + } + + _x = _x / scale - shift; _x = clamp(_x, 0., 1.); - int segments = curve_amount / 6 - 1; + + int segments = (curve_amount - _shf) / 6 - 1; for( int i = 0; i < segments; i++ ) { - int ind = i * 6; + int ind = _shf + i * 6; float _x0 = alpha_curve[ind + 2]; float _y0 = alpha_curve[ind + 3]; //float bx0 = _x0 + alpha_curve[ind + 0]; @@ -229,16 +241,16 @@ float curveEval(in float _x) { #region #endregion //////////////////////////////////// GRADIENT //////////////////////////////////// -float frandom (in vec2 st, in float _seed) { #region +float frandom (in vec2 st, in float _seed) { float f = fract(sin(dot(st.xy, vec2(12.9898, 78.233)) * mod(15.15 + seed, 32.156 + _seed) * 12.588) * 43758.5453123); return mix(-1., 1., f); -} #endregion +} -vec2 vrandom (in vec2 st) { #region +vec2 vrandom (in vec2 st) { return vec2(frandom(st, 165.874), frandom(st, 98.601)); -} #endregion +} -void main() { #region +void main() { vec2 _pos = v_vTexcoord; float str = strength; @@ -264,4 +276,4 @@ void main() { #region } gl_FragColor = _col; -} #endregion \ No newline at end of file +} \ No newline at end of file diff --git a/sprites/s_add_node_bg/8629fe45-e969-45cd-8376-faa12eb0a268.png b/sprites/s_add_node_bg/8629fe45-e969-45cd-8376-faa12eb0a268.png new file mode 100644 index 000000000..ef5383914 Binary files /dev/null and b/sprites/s_add_node_bg/8629fe45-e969-45cd-8376-faa12eb0a268.png differ diff --git a/sprites/s_add_node_bg/layers/8629fe45-e969-45cd-8376-faa12eb0a268/fdf3c4e8-80d1-411b-bb55-504d7b59af86.png b/sprites/s_add_node_bg/layers/8629fe45-e969-45cd-8376-faa12eb0a268/fdf3c4e8-80d1-411b-bb55-504d7b59af86.png new file mode 100644 index 000000000..ef5383914 Binary files /dev/null and b/sprites/s_add_node_bg/layers/8629fe45-e969-45cd-8376-faa12eb0a268/fdf3c4e8-80d1-411b-bb55-504d7b59af86.png differ diff --git a/sprites/s_add_node_bg/s_add_node_bg.yy b/sprites/s_add_node_bg/s_add_node_bg.yy new file mode 100644 index 000000000..fd97d91b9 --- /dev/null +++ b/sprites/s_add_node_bg/s_add_node_bg.yy @@ -0,0 +1,109 @@ +{ + "$GMSprite":"", + "%Name":"s_add_node_bg", + "bboxMode":0, + "bbox_bottom":23, + "bbox_left":0, + "bbox_right":11, + "bbox_top":0, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"","%Name":"8629fe45-e969-45cd-8376-faa12eb0a268","name":"8629fe45-e969-45cd-8376-faa12eb0a268","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":24, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"fdf3c4e8-80d1-411b-bb55-504d7b59af86","blendMode":0,"displayName":"default","isLocked":false,"name":"fdf3c4e8-80d1-411b-bb55-504d7b59af86","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"s_add_node_bg", + "nineSlice":{ + "$GMNineSliceData":"", + "bottom":0, + "enabled":true, + "guideColour":[4294902015,4294902015,4294902015,4294902015,], + "highlightColour":1728023040, + "highlightStyle":0, + "left":0, + "resourceType":"GMNineSliceData", + "resourceVersion":"2.0", + "right":0, + "tileMode":[ + 0, + 0, + 0, + 0, + 0, + ], + "top":23, + }, + "origin":4, + "parent":{ + "name":"UI", + "path":"folders/theme/UI.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"", + "%Name":"s_add_node_bg", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"s_add_node_bg", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8629fe45-e969-45cd-8376-faa12eb0a268","path":"sprites/s_add_node_bg/s_add_node_bg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"10166e59-8771-4110-81f5-e1316e6598e7","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":6, + "yorigin":12, + }, + "swatchColours":null, + "swfPrecision":0.5, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", + }, + "type":0, + "VTile":false, + "width":12, +} \ No newline at end of file diff --git a/sprites/s_node_tile_random/57c767c9-5179-450f-8ef9-9206358bae13.png b/sprites/s_node_tile_random/57c767c9-5179-450f-8ef9-9206358bae13.png new file mode 100644 index 000000000..a8b5fe927 Binary files /dev/null and b/sprites/s_node_tile_random/57c767c9-5179-450f-8ef9-9206358bae13.png differ diff --git a/sprites/s_node_tile_random/layers/57c767c9-5179-450f-8ef9-9206358bae13/4a9914a8-c4cb-4bcb-bd07-c45be5ce6b74.png b/sprites/s_node_tile_random/layers/57c767c9-5179-450f-8ef9-9206358bae13/4a9914a8-c4cb-4bcb-bd07-c45be5ce6b74.png new file mode 100644 index 000000000..a8b5fe927 Binary files /dev/null and b/sprites/s_node_tile_random/layers/57c767c9-5179-450f-8ef9-9206358bae13/4a9914a8-c4cb-4bcb-bd07-c45be5ce6b74.png differ diff --git a/sprites/s_node_tile_random/s_node_tile_random.yy b/sprites/s_node_tile_random/s_node_tile_random.yy new file mode 100644 index 000000000..3cef3df6a --- /dev/null +++ b/sprites/s_node_tile_random/s_node_tile_random.yy @@ -0,0 +1,90 @@ +{ + "$GMSprite":"", + "%Name":"s_node_tile_random", + "bboxMode":0, + "bbox_bottom":63, + "bbox_left":0, + "bbox_right":63, + "bbox_top":0, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"","%Name":"57c767c9-5179-450f-8ef9-9206358bae13","name":"57c767c9-5179-450f-8ef9-9206358bae13","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":64, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"4a9914a8-c4cb-4bcb-bd07-c45be5ce6b74","blendMode":0,"displayName":"default","isLocked":false,"name":"4a9914a8-c4cb-4bcb-bd07-c45be5ce6b74","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"s_node_tile_random", + "nineSlice":null, + "origin":4, + "parent":{ + "name":"transform", + "path":"folders/nodes/icons/transform.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"", + "%Name":"s_node_tile_random", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"s_node_tile_random", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"57c767c9-5179-450f-8ef9-9206358bae13","path":"sprites/s_node_tile_random/s_node_tile_random.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"8142b764-d0fd-4c4f-8566-9b67b26e6a3e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":32, + "yorigin":32, + }, + "swatchColours":null, + "swfPrecision":0.5, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", + }, + "type":0, + "VTile":false, + "width":64, +} \ No newline at end of file