1- using System . ComponentModel ;
1+ using System . ComponentModel ;
22using System . ComponentModel . DataAnnotations ;
33using System . Diagnostics . CodeAnalysis ;
44using System . Drawing ;
@@ -67,16 +67,16 @@ public record TiledVAEDecode : ComfyTypedNodeBase<ImageNodeConnection>
6767 {
6868 public required LatentNodeConnection Samples { get ; init ; }
6969 public required VAENodeConnection Vae { get ; init ; }
70-
70+
7171 [ Range ( 64 , 4096 ) ]
7272 public int TileSize { get ; init ; } = 512 ;
73-
73+
7474 [ Range ( 0 , 4096 ) ]
7575 public int Overlap { get ; init ; } = 64 ;
76-
76+
7777 [ Range ( 8 , 4096 ) ]
7878 public int TemporalSize { get ; init ; } = 64 ;
79-
79+
8080 [ Range ( 4 , 4096 ) ]
8181 public int TemporalOverlap { get ; init ; } = 8 ;
8282 }
@@ -1097,48 +1097,49 @@ public record NRS : ComfyTypedNodeBase<ModelNodeConnection>
10971097 public required double Squash { get ; set ; }
10981098 }
10991099
1100- public ImageNodeConnection Lambda_LatentToImage (
1101- LatentNodeConnection latent ,
1102- VAENodeConnection vae ,
1103- bool useTiledVAE = false ,
1104- int tileSize = 512 ,
1105- int overlap = 64 ,
1106- int temporalSize = 64 ,
1107- int temporalOverlap = 8 )
1108- {
1109- if ( useTiledVAE )
1110- {
1111- var name = GetUniqueName ( "VAEDecodeTiled" ) ;
1112- return Nodes
1113- . AddTypedNode (
1114- new TiledVAEDecode
1115- {
1116- Name = name ,
1117- Samples = latent ,
1118- Vae = vae ,
1119- TileSize = tileSize ,
1120- Overlap = overlap ,
1121- TemporalSize = temporalSize ,
1122- TemporalOverlap = temporalOverlap
1123- }
1124- )
1125- . Output ;
1126- }
1127- else
1100+ public ImageNodeConnection Lambda_LatentToImage (
1101+ LatentNodeConnection latent ,
1102+ VAENodeConnection vae ,
1103+ bool useTiledVAE = false ,
1104+ int tileSize = 512 ,
1105+ int overlap = 64 ,
1106+ int temporalSize = 64 ,
1107+ int temporalOverlap = 8
1108+ )
11281109 {
1129- var name = GetUniqueName ( "VAEDecode" ) ;
1130- return Nodes
1131- . AddTypedNode (
1132- new VAEDecode
1133- {
1134- Name = name ,
1135- Samples = latent ,
1136- Vae = vae ,
1137- }
1138- )
1139- . Output ;
1110+ if ( useTiledVAE )
1111+ {
1112+ var name = GetUniqueName ( "VAEDecodeTiled" ) ;
1113+ return Nodes
1114+ . AddTypedNode (
1115+ new TiledVAEDecode
1116+ {
1117+ Name = name ,
1118+ Samples = latent ,
1119+ Vae = vae ,
1120+ TileSize = tileSize ,
1121+ Overlap = overlap ,
1122+ TemporalSize = temporalSize ,
1123+ TemporalOverlap = temporalOverlap ,
1124+ }
1125+ )
1126+ . Output ;
1127+ }
1128+ else
1129+ {
1130+ var name = GetUniqueName ( "VAEDecode" ) ;
1131+ return Nodes
1132+ . AddTypedNode (
1133+ new VAEDecode
1134+ {
1135+ Name = name ,
1136+ Samples = latent ,
1137+ Vae = vae ,
1138+ }
1139+ )
1140+ . Output ;
1141+ }
11401142 }
1141- }
11421143
11431144 public LatentNodeConnection Lambda_ImageToLatent ( ImageNodeConnection pixels , VAENodeConnection vae )
11441145 {
@@ -1547,28 +1548,33 @@ public ImageNodeConnection GetPrimaryAsImage()
15471548 /// <summary>
15481549 /// Get or convert latest primary connection to image
15491550 /// </summary>
1550- < << << << HEAD
1551- public ImageNodeConnection GetPrimaryAsImage( PrimaryNodeConnection primary , VAENodeConnection vae )
1551+ public ImageNodeConnection GetPrimaryAsImage (
1552+ PrimaryNodeConnection primary ,
1553+ VAENodeConnection vae ,
1554+ bool useTiledVAE = false ,
1555+ int tileSize = 512 ,
1556+ int overlap = 64 ,
1557+ int temporalSize = 64 ,
1558+ int temporalOverlap = 8
1559+ )
15521560 {
1553- return primary . Match ( latent => Lambda_LatentToImage ( latent , vae ) , image => image ) ;
1561+ return primary . Match (
1562+ latent =>
1563+ Lambda_LatentToImage (
1564+ latent ,
1565+ vae ,
1566+ useTiledVAE ,
1567+ tileSize ,
1568+ overlap ,
1569+ temporalSize ,
1570+ temporalOverlap
1571+ ) ,
1572+ image => image
1573+ ) ;
15541574 }
15551575
1556- = == == ==
1557- public ImageNodeConnection GetPrimaryAsImage (
1558- PrimaryNodeConnection primary ,
1559- VAENodeConnection vae ,
1560- bool useTiledVAE = false ,
1561- int tileSize = 512 ,
1562- int overlap = 64 ,
1563- int temporalSize = 64 ,
1564- int temporalOverlap = 8 )
1565- {
1566- return primary . Match (
1567- latent => Lambda_LatentToImage ( latent , vae , useTiledVAE , tileSize , overlap , temporalSize , temporalOverlap ) ,
1568- image => image
1569- ) ;
1570- }
1571- > >>> >>> 27 accf16 ( Update ComfyNodeBuilder . cs)
1576+
1577+
15721578 /// <summary>
15731579 /// Get or convert latest primary connection to image
15741580 /// </summary>
@@ -1685,4 +1691,4 @@ public VAENodeConnection GetDefaultVAE()
16851691 }
16861692
16871693 public NodeBuilderConnections Connections { get ; } = new ( ) ;
1688- }
1694+ }
0 commit comments