Skip to content

Commit 214e99f

Browse files
lkruellkruel
committed
[BUGFIX] *MapBox* node will now properly respect manual mode and the OSM tiles will be offset properly
1 parent d89bafd commit 214e99f

File tree

6 files changed

+47
-46
lines changed

6 files changed

+47
-46
lines changed

‎otls/sop_mapbox.hda/INDEX__SECTION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ Outputs: 2
1111
Subnet: true
1212
Python: false
1313
Empty: false
14-
Modified: Fri Jun 7 14:31:11 2019
14+
Modified: Thu Aug 8 10:12:24 2019
1515

‎otls/sop_mapbox.hda/gamedev_8_8Sop_1sop__mapbox/Contents.dir/.OPdummydefs‎

0 Bytes
Binary file not shown.

‎otls/sop_mapbox.hda/gamedev_8_8Sop_1sop__mapbox/Contents.dir/.OPfallbacks‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,10 +144,10 @@ Vop/setlayercomponent C:/PROGRA~1/SIDEEF~1/HOUDIN~1.259/houdini/otls/OPlibVop.hd
144144
Vop/setlayercomponent otls/OPlibVop.hda
145145
Vop/smooth C:/PROGRA~1/SIDEEF~1/HOUDIN~1.259/houdini/otls/OPlibScripted.hda
146146
Vop/smooth otls/OPlibScripted.hda
147-
Vop/split C:/PROGRA~1/SIDEEF~1/HOUDIN~1.259/houdini/otls/OPlibVop.hda
148-
Vop/split otls/OPlibVop.hda
149147
Sop/split C:/PROGRA~1/SIDEEF~1/HOUDIN~1.259/houdini/otls/OPlibSop.hda
150148
Sop/split otls/OPlibSop.hda
149+
Vop/split C:/PROGRA~1/SIDEEF~1/HOUDIN~1.259/houdini/otls/OPlibVop.hda
150+
Vop/split otls/OPlibVop.hda
151151
Vop/subconst C:/PROGRA~1/SIDEEF~1/HOUDIN~1.259/houdini/otls/OPlibScripted.hda
152152
Vop/subconst otls/OPlibScripted.hda
153153
Vop/surfacecolor::3.0 C:/PROGRA~1/SIDEEF~1/HOUDIN~1.259/houdini/otls/OPlibVop.hda

‎otls/sop_mapbox.hda/gamedev_8_8Sop_1sop__mapbox/Contents.dir/Contents.mime‎

Lines changed: 40 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,13 @@ Content-Type: text/plain
3232

3333
sopflags sopflags =
3434
comment ""
35-
position -1.45661 0.0768245
36-
connectornextid 0
37-
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
35+
position 0.986334 1.91918
36+
connectornextid 2
37+
flags = lock off model off template on footprint off xray off bypass off display on render on highlight off unload off savedata off compress on colordefault on exposed on
3838
outputsNamed3
3939
{
40+
0 "output1"
41+
1 "output2"
4042
}
4143
inputsNamed3
4244
{
@@ -46,9 +48,9 @@ inputs
4648
}
4749
stat
4850
{
49-
create 1559931879
50-
modify 1559932216
51-
author MAINGEAR@DESKTOP-P98C1VA
51+
create 1561035732
52+
modify 1565273459
53+
author matt@tatooine
5254
access 0777
5355
}
5456
color UT_Color RGB 0.8 0.8 0.8
@@ -85,7 +87,7 @@ Content-Type: text/plain
8587
}
8688
{
8789
create 1540836448
88-
modify 1559931879
90+
modify 1565272784
8991
author MAINGEAR@DESKTOP-P98C1VA
9092
access 0777
9193
}
@@ -108,7 +110,7 @@ Content-Type: text/plain
108110
}
109111
{
110112
create 1540836510
111-
modify 1559931882
113+
modify 1565272787
112114
author MAINGEAR@DESKTOP-P98C1VA
113115
access 0777
114116
}
@@ -131,7 +133,7 @@ Content-Type: text/plain
131133
}
132134
{
133135
create 1540836660
134-
modify 1559931884
136+
modify 1565272788
135137
author MAINGEAR@DESKTOP-P98C1VA
136138
access 0777
137139
}
@@ -154,7 +156,7 @@ Content-Type: text/plain
154156
}
155157
{
156158
create 1540836799
157-
modify 1559931886
159+
modify 1565272790
158160
author MAINGEAR@DESKTOP-P98C1VA
159161
access 0777
160162
}
@@ -178,7 +180,7 @@ Content-Type: text/plain
178180
}
179181
{
180182
create 1540836908
181-
modify 1559931884
183+
modify 1565272789
182184
author MAINGEAR@DESKTOP-P98C1VA
183185
access 0777
184186
}
@@ -202,7 +204,7 @@ Content-Type: text/plain
202204
}
203205
{
204206
create 1540837031
205-
modify 1559931881
207+
modify 1565272786
206208
author MAINGEAR@DESKTOP-P98C1VA
207209
access 0777
208210
}
@@ -226,7 +228,7 @@ Content-Type: text/plain
226228
}
227229
{
228230
create 1540837145
229-
modify 1559931881
231+
modify 1565272786
230232
author MAINGEAR@DESKTOP-P98C1VA
231233
access 0777
232234
}
@@ -249,7 +251,7 @@ Content-Type: text/plain
249251
}
250252
{
251253
create 1540837171
252-
modify 1559931893
254+
modify 1565272798
253255
author MAINGEAR@DESKTOP-P98C1VA
254256
access 0777
255257
}
@@ -358,7 +360,7 @@ layerborder [ 0 locks=0 ] ( "constant" )
358360
layerborderval [ 0 locks=0 ] ( 0 )
359361
folder0 [ 0 locks=0 ] ( 0 )
360362
sizemethod [ 0 locks=0 ] ( "size" )
361-
size [ 8 locks=0 ] ( [ size 9156.908170837889 ] )
363+
size [ 8 locks=0 ] ( [ size 4030.6488656485249 ] )
362364
gridspacing [ 0 locks=0 ] ( 1 )
363365
uniformscale [ 0 locks=0 ] ( 1 )
364366
folder2 [ 0 locks=0 ] ( 0 )
@@ -501,7 +503,7 @@ inputs
501503
stat
502504
{
503505
create 1528379399
504-
modify 1559931890
506+
modify 1565273456
505507
author MAINGEAR@DESKTOP-P98C1VA
506508
access 0777
507509
}
@@ -553,7 +555,7 @@ Content-Disposition: attachment; filename="hdaroot/cop2net1/vopcop2filter1.cop2"
553555
Content-Type: text/plain
554556

555557
2
556-
299
558+
301
557559
0
558560

559561
--HOUDINIMIMEBOUNDARY0xD3ADD339-0x00000F49-0x56B122C9-0x00000001HOUDINIMIMEBOUNDARY
@@ -2414,7 +2416,7 @@ Content-Type: text/plain
24142416
{
24152417
version 0.8
24162418
folder1 [ 0 locks=0 ] ( 0 )
2417-
scale [ 8 locks=0 ] ( [ scale 0.00011408044446096671 ] )
2419+
scale [ 8 locks=0 ] ( [ scale 0.00024809901168086537 ] )
24182420
gridscale [ 0 locks=0 ] ( 1 )
24192421
heightscale [ 8 locks=0 ] ( 1 )
24202422
heightoffset [ 0 locks=0 ] ( 0 )
@@ -2502,7 +2504,7 @@ Content-Type: text/plain
25022504
{
25032505
version 0.8
25042506
folder1 [ 0 locks=0 ] ( 0 )
2505-
scale [ 8 locks=0 ] ( [ scale 8765.744249376201 ] )
2507+
scale [ 8 locks=0 ] ( [ scale 4030.6488656485249 ] )
25062508
gridscale [ 0 locks=0 ] ( 1 )
25072509
heightscale [ 8 locks=0 ] ( 1 )
25082510
heightoffset [ 0 locks=0 ] ( 0 )
@@ -3773,7 +3775,7 @@ sopflags sopflags =
37733775
comment ""
37743776
position -6.5 -2.01067
37753777
connectornextid 2
3776-
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
3778+
flags = lock off model off template off footprint off xray off bypass off display off render off highlight off unload off savedata off compress on colordefault on exposed on
37773779
outputsNamed3
37783780
{
37793781
1 "output1"
@@ -3789,7 +3791,7 @@ inputs
37893791
stat
37903792
{
37913793
create 1538164406
3792-
modify 1548775144
3794+
modify 1565272116
37933795
author MAINGEAR@DESKTOP-P98C1VA
37943796
access 0777
37953797
}
@@ -3829,7 +3831,7 @@ gridscale [ 0 locks=0 ] ( 1 )
38293831
heightscale [ 8 locks=0 ] ( 1 )
38303832
heightoffset [ 0 locks=0 ] ( 0 )
38313833
folder0 [ 0 locks=0 ] ( 0 )
3832-
tx [ 8 locks=0 ] ( [ tx 0 ] )
3834+
tx [ 8 locks=0 ] ( [ tx 4030.6488656485249 ] )
38333835
tz [ 8 locks=0 ] ( [ tz -0 ] )
38343836
ry [ 0 locks=0 ] ( 0 )
38353837
}
@@ -3879,7 +3881,7 @@ inputs
38793881
stat
38803882
{
38813883
create 1528379386
3882-
modify 1559932234
3884+
modify 1565273434
38833885
author MAINGEAR@DESKTOP-P98C1VA
38843886
access 0777
38853887
}
@@ -3971,7 +3973,7 @@ Content-Disposition: attachment; filename="hdaroot/cop2net1/input_file.cop2"
39713973
Content-Type: text/plain
39723974

39733975
2
3974-
222
3976+
230
39753977
0
39763978

39773979
--HOUDINIMIMEBOUNDARY0xD3ADD339-0x00000F49-0x56B122C9-0x00000001HOUDINIMIMEBOUNDARY
@@ -4112,7 +4114,7 @@ inputs
41124114
stat
41134115
{
41144116
create 1528468569
4115-
modify 1548449808
4117+
modify 1565272525
41164118
author MAINGEAR@DESKTOP-P98C1VA
41174119
access 0777
41184120
}
@@ -4127,7 +4129,7 @@ Content-Type: text/plain
41274129

41284130
{
41294131
version 0.8
4130-
osm_file [ 0 locks=0 ] ( `chs(\"../download_path_osm\")` )
4132+
osm_file [ 8 locks=0 ] ( `chs(\"../download_path_osm\")` )
41314133
build_nodes [ 0 locks=0 ] ( "off" )
41324134
read_building_colors [ 0 locks=0 ] ( "off" )
41334135
only_close_buildings [ 0 locks=0 ] ( "on" )
@@ -4255,7 +4257,7 @@ inputs
42554257
stat
42564258
{
42574259
create 1528725488
4258-
modify 1548702309
4260+
modify 1565273276
42594261
author MAINGEAR@DESKTOP-P98C1VA
42604262
access 0777
42614263
}
@@ -6265,7 +6267,7 @@ inputs
62656267
stat
62666268
{
62676269
create 1537983891
6268-
modify 1548775148
6270+
modify 1565272608
62696271
author MAINGEAR@DESKTOP-P98C1VA
62706272
access 0777
62716273
}
@@ -6283,13 +6285,13 @@ Content-Type: text/plain
62836285
lefttype = extend
62846286
righttype = extend
62856287
flags = 0
6286-
segment { length = 0 expr = "bbox(\"../offsets1\", D_XSIZE)/-2" }
6288+
segment { length = 0 expr = "bbox(\"../modify_scale\", D_XSIZE)/-2" }
62876289
}
62886290
channel tz {
62896291
lefttype = extend
62906292
righttype = extend
62916293
flags = 0
6292-
segment { length = 0 expr = "bbox(\"../offsets1\", D_ZSIZE)/2" }
6294+
segment { length = 0 expr = "bbox(\"../modify_scale\", D_ZSIZE)/2" }
62936295
}
62946296
}
62956297

@@ -6303,7 +6305,7 @@ group [ 0 locks=0 ] ( "" )
63036305
grouptype [ 0 locks=0 ] ( "guess" )
63046306
xOrd [ 0 locks=0 ] ( "srt" )
63056307
rOrd [ 0 locks=0 ] ( "xyz" )
6306-
t [ 8 locks=0 ] ( [ tx -1767.019287109375 ] 0 [ tz 1767.019287109375 ] )
6308+
t [ 8 locks=0 ] ( [ tx -2014.3404541015625 ] 0 [ tz 2014.3404541015625 ] )
63076309
r [ 0 locks=0 ] ( 0 90 0 )
63086310
s [ 0 locks=0 ] ( 1 1 1 )
63096311
shear [ 0 locks=0 ] ( 0 0 0 )
@@ -6461,7 +6463,7 @@ inputs
64616463
stat
64626464
{
64636465
create 1537971645
6464-
modify 1548775155
6466+
modify 1565272480
64656467
author MAINGEAR@DESKTOP-P98C1VA
64666468
access 0777
64676469
}
@@ -6499,7 +6501,7 @@ group [ 0 locks=0 ] ( "" )
64996501
grouptype [ 0 locks=0 ] ( "guess" )
65006502
xOrd [ 0 locks=0 ] ( "srt" )
65016503
rOrd [ 0 locks=0 ] ( "xyz" )
6502-
t [ 8 locks=0 ] ( [ tx 0 ] 0 [ tz -0 ] )
6504+
t [ 8 locks=0 ] ( [ tx 4028.680908203125 ] 0 [ tz -0 ] )
65036505
r [ 0 locks=0 ] ( 0 0 0 )
65046506
s [ 0 locks=0 ] ( 1 1 1 )
65056507
shear [ 0 locks=0 ] ( 0 0 0 )
@@ -6555,9 +6557,9 @@ Content-Type: text/plain
65556557

65566558
sopflags sopflags =
65576559
comment ""
6558-
position 11.3634 -3.17169
6560+
position 11.5 -3.12259
65596561
connectornextid 2
6560-
flags = lock off model off template off footprint off xray off bypass off display off render off highlight off unload off savedata off compress on colordefault on exposed on
6562+
flags = lock off model off template on footprint off xray off bypass off display on render on highlight off unload off savedata off compress on colordefault on exposed on
65616563
outputsNamed3
65626564
{
65636565
1 "output1"
@@ -6573,7 +6575,7 @@ inputs
65736575
stat
65746576
{
65756577
create 1537971645
6576-
modify 1548775148
6578+
modify 1565272619
65776579
author MAINGEAR@DESKTOP-P98C1VA
65786580
access 0777
65796581
}
@@ -6591,13 +6593,13 @@ Content-Type: text/plain
65916593
lefttype = extend
65926594
righttype = extend
65936595
flags = 0
6594-
segment { length = 0 expr = "bbox(\"../offsets1\", D_XSIZE)*ch(\"../offsetsy\")" }
6596+
segment { length = 0 expr = "bbox(\"../offsets1\", D_XSIZE)*ch(\"../offsetsx\")" }
65956597
}
65966598
channel tz {
65976599
lefttype = extend
65986600
righttype = extend
65996601
flags = 0
6600-
segment { length = 0 expr = "bbox(\"../offsets1\", D_ZSIZE)*-ch(\"../offsetsx\")" }
6602+
segment { length = 0 expr = "bbox(\"../offsets1\", D_ZSIZE)*-ch(\"../offsetsy\")" }
66016603
}
66026604
}
66036605

‎otls/sop_mapbox.hda/gamedev_8_8Sop_1sop__mapbox/ExtraFileOptions‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
},
2222
"PythonModule/Cursor":{
2323
"type":"intarray",
24-
"value":[88,17]
24+
"value":[32,1]
2525
},
2626
"PythonModule/IsExpr":{
2727
"type":"bool",

‎otls/sop_mapbox.hda/gamedev_8_8Sop_1sop__mapbox/PythonModule‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,9 @@ def latlong_distance(lat_long_1, lat_long_2):
2525
return distance * 1000
2626

2727
def update(node):
28-
29-
launch_map(hidden=True)
30-
#time.sleep(3)
31-
hou.session.mapbox_web.urlChanged.connect(url_changed)
28+
if hou.updateModeSetting() != hou.updateMode.Manual:
29+
launch_map(hidden=True)
30+
hou.session.mapbox_web.urlChanged.connect(url_changed)
3231

3332

3433
def url_changed(new_url):

0 commit comments

Comments
 (0)