Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[BUGFIX] Fixed Bug 101213 *Building Generator* and bug 106475 *Game Baker* #28

Open
wants to merge 5 commits into
base: Development
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion otls/building_generator.hda/INDEX__SECTION
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ Outputs: 2
Subnet: true
Python: false
Empty: false
Modified: Wed Nov 18 09:50:01 2020
Modified: Tue Jun 1 15:38:07 2021

Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@
"hdaroot/python2.def":1547497278,
"hdaroot/attribdelete8.def":1548467103,
"hdaroot/uvtexture3.def":1548285624,
"hdaroot.def":1553718154,
"hdaroot.def":1622587018,
"hdaroot/attribtransfer1.def":1547841144,
"hdaroot/attribwrangle25.def":1547504122
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"values":["0.1","18.5.400"
"values":["0.1","18.5.595"
],
"indexes":{
"hdaroot/fuse7.userdata":1,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,36 +32,26 @@ Content-Type: text/plain

sopflags sopflags =
comment ""
position -63.6726 113.176
connectornextid 6
flags = lock off model off template off footprint off xray off bypass off display on render on highlight off unload off savedata off compress on colordefault off exposed on
position -0.344771 1.45131
connectornextid 0
flags = lock off model off template off footprint off xray off bypass off display on render on highlight off unload off savedata off compress on colordefault on exposed on
outputsNamed3
{
0 "output1"
1 "output2"
}
inputsNamed3
{
2 boolean14 2 1 "input1"
3 merge5 1 1 "input2"
4 merge9 2 1 "input3"
5 sop_building_generator_utility1 1 1 "input4"
}
inputs
{
0 boolean14 0 1
1 merge5 0 1
2 merge9 0 1
3 sop_building_generator_utility1 0 1
}
stat
{
create -1
modify -1
author prisms@threadripper1
author prisms@threadripper3
access 0777
}
color UT_Color RGB 0.839 0.839 0.839
color UT_Color RGB 0.8 0.8 0.8
delscript ""
exprlanguage hscript
end
Expand Down Expand Up @@ -2989,8 +2979,8 @@ if (!inpointgroup(0, \"CONVEXCORNER\", @ptnum)) {
s@RIGHTCORNER = point(2, \"LedgeTConcaveCornerIDRAtIndex\", matchingPtNum);
}
else{
s@MODULE_INSTANCE = point(2, \"ConvexCornerIDLAtIndex\", matchingPtNum);
s@RIGHTCORNER = point(2, \"ConvexCornerIDRAtIndex\", matchingPtNum);
s@MODULE_INSTANCE = point(2, \"ConcaveCornerIDLAtIndex\", matchingPtNum);
s@RIGHTCORNER = point(2, \"ConcaveCornerIDRAtIndex\", matchingPtNum);
}

} else {
Expand All @@ -3006,8 +2996,8 @@ if (!inpointgroup(0, \"CONVEXCORNER\", @ptnum)) {
s@RIGHTCORNER = point(2, \"LedgeTConvexCornerIDRAtIndex\", matchingPtNum);
}
else{
s@MODULE_INSTANCE = point(2, \"ConcaveCornerIDLAtIndex\", matchingPtNum);
s@RIGHTCORNER = point(2, \"ConcaveCornerIDRAtIndex\", matchingPtNum);
s@MODULE_INSTANCE = point(2, \"ConvexCornerIDLAtIndex\", matchingPtNum);
s@RIGHTCORNER = point(2, \"ConvexCornerIDRAtIndex\", matchingPtNum);
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -278,40 +278,40 @@
"hdaroot/blast1.def":1597422947,
"hdaroot/foreach_end5.def":1597422947,
"hdaroot/object_merge13.def":1597423146,
"hdaroot/__netbox8.netboxinit":1605721790,
"hdaroot/__netbox8.netboxinit":1622587051,
"hdaroot/compile_begin9.def":1597422947,
"hdaroot/merge5.def":1597422947,
"hdaroot/Snapping_Rint1.def":1597422906,
"hdaroot/__netbox6.netboxinit":1605721782,
"hdaroot/__netbox6.netboxinit":1622587043,
"hdaroot/foreach_end6.def":1597422947,
"hdaroot/merge1.def":1583245372,
"hdaroot/normal4.def":1597422947,
"hdaroot/polyfill5.def":1597422947,
"hdaroot/attribwrangle46.def":1597422947,
"hdaroot/__netbox4.netboxinit":1605721762,
"hdaroot/__netbox4.netboxinit":1622587023,
"hdaroot/attribwrangle7.def":1597423016,
"hdaroot/attribpromote1.def":1597422947,
"hdaroot/attribwrangle24.def":1597422947,
"hdaroot/attribwrangle10.def":1597422947,
"hdaroot/__netbox2.netboxinit":1605721768,
"hdaroot/__netbox2.netboxinit":1622587029,
"hdaroot/attribwrangle48.def":1597422667,
"hdaroot/attribwrangle40.def":1597422667,
"hdaroot/object_merge7.def":1597422667,
"hdaroot/attribwrangle21.def":1597423154,
"hdaroot/intersectionstitch1.def":1597422947,
"hdaroot/__netbox3.netboxinit":1605721775,
"hdaroot/__netbox1.netboxinit":1605721768,
"hdaroot/__netbox3.netboxinit":1622587036,
"hdaroot/__netbox1.netboxinit":1622587029,
"hdaroot/enumerate4.def":1597422947,
"hdaroot/attribwrangle37.def":1597422947,
"hdaroot/attribwrangle37.def":1622585722,
"hdaroot/foreach_begin10_metadata1.def":1597422667,
"hdaroot/attribwrangle4.def":1597422947,
"hdaroot/polypath3.def":1597422947,
"hdaroot/__netbox9.netboxinit":1605721844,
"hdaroot/__netbox9.netboxinit":1622587105,
"hdaroot/object_merge9.def":1597422667,
"hdaroot/color1.def":1583245372,
"hdaroot/grouppromote2.def":1597422947,
"hdaroot/null13.def":1597423051,
"hdaroot/__netbox5.netboxinit":1605721784,
"hdaroot/__netbox5.netboxinit":1622587045,
"hdaroot/foreach_begin7.def":1597422667,
"hdaroot/font1.def":1583245372,
"hdaroot/attribwrangle32.def":1597422947,
Expand All @@ -322,12 +322,12 @@
"hdaroot/attribwrangle8.def":1597422947,
"hdaroot/foreach_end10.def":1597423526,
"hdaroot/foreach_begin5.def":1605721804,
"hdaroot/__netbox7.netboxinit":1605721772,
"hdaroot/__netbox7.netboxinit":1622587033,
"hdaroot/attribcopy1.def":1597422947,
"hdaroot/python2.def":1597422947,
"hdaroot/attribdelete8.def":1597422947,
"hdaroot/uvtexture3.def":1583245372,
"hdaroot.def":1605721801,
"hdaroot.def":1622587028,
"hdaroot/attribtransfer1.def":1597422947,
"hdaroot/attribwrangle25.def":1597422947
}
2 changes: 1 addition & 1 deletion otls/games_baker.hda/INDEX__SECTION
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Inputs: 0 to 1
Subnet: true
Python: false
Empty: false
Modified: Tue Jun 16 11:56:38 2020
Modified: Tue Jun 1 15:28:01 2021

Operator: labs::games_baker
Label: Labs Games Baker
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
{
"hdaroot/render_composite.def":1496798868,
"hdaroot/extract_net/height_normalized/channelcopy3.def":1496962078,
"hdaroot/extract_net/height_normalized/NORMALISED.def":1496953519,
"hdaroot/extract_net/height_normalized/subtract5.def":1496953321,
"hdaroot/extract_net/height_normalized/subtract4.def":1496953262,
"hdaroot/extract_net/height_normalized/multiply1.def":1496953202,
"hdaroot/extract_net/height_normalized/function1.def":1496953191,
"hdaroot/alpha_bake.def":1496776162,
"hdaroot/extract_net/height_normalized/subtract3.def":1496952943,
"hdaroot/extract_net/height_normalized/color1.def":1496952905,
"hdaroot/extract_net/height_normalized/subtract2.def":1496952806,
"hdaroot/extract_net/height_normalized/equalize2.def":1496952784,
"hdaroot/extract_net/height_normalized/darkest.def":1496952960,
"hdaroot/extract_net/height_normalized/equalize3.def":1496952784,
"hdaroot/extract_net/normalized.def":1496799606,
"hdaroot/objnet/custom_export/high_merge.def":1496780594,
"hdaroot/objnet/custom_export/switch1.def":1496782511,
"hdaroot/objnet/cam1/xform1.def":1496783357,
"hdaroot/objnet/cam1/camOrigin.def":1496783357,
"hdaroot/objnet/cam1.def":1496783357,
"hdaroot/objnet/high/normal1.def":1504475191,
"hdaroot/objnet/high/switch2.def":1504475028,
"hdaroot/extract_net/base_image.def":1496798847,
"hdaroot/extract_net/height_normalized.def":1496960406,
"hdaroot/objnet/high/switch3.def":1504474956,
"hdaroot/objnet/high/high_merge.def":1496780594,
"hdaroot/objnet/high/attribpromote1.def":1504475094,
"hdaroot/objnet/high/switch4.def":1509741521,
"hdaroot/extract_net/height_normalized/null1.def":1496954760,
"hdaroot/objnet/high/material1.def":1509741512,
"hdaroot/objnet/high/switch1.def":1496782511,
"hdaroot/render_singles.def":1496798868,
"hdaroot/objnet/high/low_merge.def":1496780594,
"hdaroot/objnet/cam1/file1.def":1496783357,
"hdaroot/objnet/low/switch2.def":1504475028,
"hdaroot/extract_net/height_normalized/subtract1.def":1496952806,
"hdaroot/objnet/low.def":1496780581,
"hdaroot/objnet/low/normal1.def":1504475191,
"hdaroot/composite_net.def":1496798844,
"hdaroot/objnet/high.def":1496780581,
"hdaroot/pre_bake0.def":1496783377,
"hdaroot/objnet/low/attribpromote1.def":1504475094,
"hdaroot/objnet/matnet/plain_white.def":1496848225,
"hdaroot/objnet/custom_export/pointwrangle1.def":1496867646,
"hdaroot/extract_net.def":1496798844,
"hdaroot/objnet/low/switch1.def":1504474956,
"hdaroot/custom_bake.def":1496776162,
"hdaroot/objnet/low/object_merge1.def":1496780594,
"hdaroot/extract_net/height_normalized/channelcopy1.def":1496962078,
"hdaroot/objnet/matnet.def":1496848220,
"hdaroot/objnet/custom_export/low_merge.def":1496780594,
"hdaroot/baketexture.def":1496776162,
"hdaroot/objnet.def":1496780578,
"hdaroot/objnet/custom_export.def":1496780581,
"hdaroot/extract_net/height_normalized/channelcopy2.def":1496962078,
"hdaroot/extract_net/height_normalized/brightest.def":1496952969,
"hdaroot.def":1557185983
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
{
"values":["0.6","17.5.229"
],
"indexes":{
"hdaroot/composite_net.userdata":1,
"hdaroot/extract_net/height_normalized/channelcopy1.userdata":1,
"hdaroot/render_singles.userdata":1,
"hdaroot/extract_net/height_normalized/NORMALISED.userdata":1,
"hdaroot/extract_net/height_normalized/channelcopy2.userdata":1,
"hdaroot/extract_net/height_normalized/subtract5.userdata":1,
"hdaroot/extract_net/height_normalized/function1.userdata":1,
"hdaroot/extract_net/height_normalized/brightest.userdata":1,
"hdaroot/extract_net/height_normalized/darkest.userdata":1,
"hdaroot/extract_net/height_normalized/color1.userdata":1,
"hdaroot/extract_net/height_normalized/equalize2.userdata":1,
"hdaroot/extract_net/height_normalized/subtract1.userdata":1,
"hdaroot/extract_net/height_normalized.userdata":1,
"hdaroot/extract_net/normalized.userdata":1,
"hdaroot/extract_net.userdata":1,
"hdaroot/objnet/custom_export/high_merge.userdata":1,
"hdaroot/render_composite.userdata":1,
"hdaroot/extract_net/height_normalized/null1.userdata":1,
"hdaroot/objnet/custom_export/switch1.userdata":1,
"hdaroot/objnet/cam1/file1.userdata":1,
"hdaroot/objnet/cam1/xform1.userdata":1,
"hdaroot/objnet/high/switch4.userdata":1,
"hdaroot/objnet/high/material1.userdata":1,
"hdaroot/pre_bake0.userdata":1,
"hdaroot/objnet/high/normal1.userdata":1,
"hdaroot/objnet/high/switch2.userdata":1,
"hdaroot/objnet/high/switch3.userdata":1,
"hdaroot/extract_net/height_normalized/equalize3.userdata":1,
"hdaroot/objnet/high/switch1.userdata":1,
"hdaroot/extract_net/height_normalized/channelcopy3.userdata":1,
"hdaroot/objnet/high/high_merge.userdata":1,
"hdaroot/objnet/low/attribpromote1.userdata":1,
"hdaroot/objnet/cam1.userdata":1,
"hdaroot/objnet/low/switch1.userdata":1,
"hdaroot/objnet/low/object_merge1.userdata":1,
"hdaroot/objnet/high.userdata":1,
"hdaroot/objnet/low/switch2.userdata":1,
"hdaroot/objnet/custom_export.userdata":1,
"hdaroot/extract_net/height_normalized/subtract2.userdata":1,
"hdaroot/objnet/custom_export/low_merge.userdata":1,
"hdaroot/extract_net/base_image.userdata":1,
"hdaroot/extract_net/height_normalized/subtract3.userdata":1,
"hdaroot/objnet/matnet.userdata":1,
"hdaroot/objnet.userdata":1,
"hdaroot/objnet/cam1/camOrigin.userdata":1,
"hdaroot/extract_net/height_normalized/subtract4.userdata":1,
"hdaroot/objnet/low/normal1.userdata":1,
"hdaroot.userdata":0,
"hdaroot/objnet/high/attribpromote1.userdata":1,
"hdaroot/extract_net/height_normalized/multiply1.userdata":1,
"hdaroot/objnet/low.userdata":1,
"hdaroot/objnet/high/low_merge.userdata":1
}
}
Loading