zimjs 18.0.7 → 18.0.8
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +1 -1
- package/src/zim.js +105 -54
- package/ts-src/typings/zim/index.d.ts +11 -11
package/package.json
CHANGED
package/src/zim.js
CHANGED
|
@@ -15968,7 +15968,7 @@ zim.Triangle = function(a, b, c, color, borderColor, borderWidth, corner, center
|
|
|
15968
15968
|
if (zot(c)) c = DS.c!=null?DS.c:a;
|
|
15969
15969
|
if (b==-1) b = Math.sqrt(Math.pow(a,2)+Math.pow(c,2));
|
|
15970
15970
|
if (c==-1) c = Math.sqrt(Math.pow(a,2)+Math.pow(b,2));
|
|
15971
|
-
|
|
15971
|
+
if (zot(corner)) corner = DS.corner!=null?DS.corner:0;
|
|
15972
15972
|
if (zot(center)) center = DS.center!=null?DS.center:true;
|
|
15973
15973
|
if (zot(adjust)) adjust = DS.adjust!=null?DS.adjust:0;
|
|
15974
15974
|
if (zot(borderColor)) borderColor = DS.borderColor!=null?DS.borderColor:null;
|
|
@@ -15981,7 +15981,7 @@ zim.Triangle = function(a, b, c, color, borderColor, borderWidth, corner, center
|
|
|
15981
15981
|
|
|
15982
15982
|
// PICK
|
|
15983
15983
|
var oa = remember(a, b, c, color, borderColor, borderWidth);
|
|
15984
|
-
|
|
15984
|
+
this.veeObj = {a:oa[0], b:oa[1], c:oa[2], color:oa[3], borderColor:oa[4], borderWidth:oa[5]};
|
|
15985
15985
|
function remember() {return arguments;} // for cloning PICK
|
|
15986
15986
|
a = zim.Pick.choose(a);
|
|
15987
15987
|
b = zim.Pick.choose(b);
|
|
@@ -15999,7 +15999,7 @@ zim.Triangle = function(a, b, c, color, borderColor, borderWidth, corner, center
|
|
|
15999
15999
|
that._borderWidth = borderWidth;
|
|
16000
16000
|
that._dashed = dashed;
|
|
16001
16001
|
if (that._dashed && !Array.isArray(that._dashed)) that._dashed = [10, 10];
|
|
16002
|
-
|
|
16002
|
+
that._corner = corner;
|
|
16003
16003
|
|
|
16004
16004
|
|
|
16005
16005
|
var lines = [a,b,c];
|
|
@@ -16020,12 +16020,12 @@ zim.Triangle = function(a, b, c, color, borderColor, borderWidth, corner, center
|
|
|
16020
16020
|
|
|
16021
16021
|
var g = tri.graphics;
|
|
16022
16022
|
that.drawShape = function() {
|
|
16023
|
-
|
|
16024
|
-
|
|
16025
|
-
|
|
16026
|
-
|
|
16027
|
-
|
|
16028
|
-
|
|
16023
|
+
var corners = [];
|
|
16024
|
+
if (Array.isArray(that._corner)) corners = that._corner;
|
|
16025
|
+
else corners.push(that._corner, that._corner, that._corner);
|
|
16026
|
+
for(var i=0; i<3; i++) {
|
|
16027
|
+
if (corners[i] < 0 || typeof corners[i] != "number") corners[i] = 0;
|
|
16028
|
+
}
|
|
16029
16029
|
|
|
16030
16030
|
g.c();
|
|
16031
16031
|
that.colorCommand = g.f(that._color).command;
|
|
@@ -16040,11 +16040,7 @@ zim.Triangle = function(a, b, c, color, borderColor, borderWidth, corner, center
|
|
|
16040
16040
|
if (that._dashed) that.borderDashedCommand = g.sd(Array.isArray(that._dashed)?that._dashed:[10, 10], that._dashedOffset).command;
|
|
16041
16041
|
}
|
|
16042
16042
|
}
|
|
16043
|
-
|
|
16044
|
-
// g.mt(5,100)
|
|
16045
|
-
// g.at(100,100, 0,0, 15).at(0,0, 0,100, 5).at(0,100,100,100, 5)
|
|
16046
|
-
|
|
16047
|
-
|
|
16043
|
+
|
|
16048
16044
|
that.one={x:0,y:0};
|
|
16049
16045
|
that.two={x:a,y:0};
|
|
16050
16046
|
|
|
@@ -16074,13 +16070,13 @@ zim.Triangle = function(a, b, c, color, borderColor, borderWidth, corner, center
|
|
|
16074
16070
|
|
|
16075
16071
|
that.three={x:a-backX,y:0-upY};
|
|
16076
16072
|
|
|
16077
|
-
|
|
16078
|
-
|
|
16079
|
-
|
|
16080
|
-
|
|
16081
|
-
|
|
16082
|
-
|
|
16083
|
-
|
|
16073
|
+
var sX = a*corners[0]/((corners[0]+corners[1])||1);
|
|
16074
|
+
g
|
|
16075
|
+
.mt(sX,0)
|
|
16076
|
+
.at(a,0, a-backX,0-upY, corners[1])
|
|
16077
|
+
.at(a-backX,0-upY, 0,0, corners[2])
|
|
16078
|
+
.at(0,0, a,0, corners[0])
|
|
16079
|
+
.lt(sX,0);
|
|
16084
16080
|
|
|
16085
16081
|
g.cp();
|
|
16086
16082
|
|
|
@@ -25400,7 +25396,7 @@ wait - (default null) - String word for button to show when button is pressed an
|
|
|
25400
25396
|
LOADING: this can be used as a loading message - so change the button to "LOADING"
|
|
25401
25397
|
When the asset has loaded, use the clearWait() method to return to the normal button or toggled button state
|
|
25402
25398
|
CONFIRMING: this can also be used to confirm user action rather than a full new confirm panel
|
|
25403
|
-
Set wait:"CONFIRM", set the waitBackgroundColor and
|
|
25399
|
+
Set wait:"CONFIRM", set the waitBackgroundColor and rollWaitBackgroundColor parameters to red and the waitTime parameter to 4
|
|
25404
25400
|
In a button mousedown (must use mousedown - not click or tap if ACTIONEVENT is mousedown - the default),
|
|
25405
25401
|
check if the waiting property is true to test for confirmation
|
|
25406
25402
|
The waiting property will not be true for the first button press but will be true during the wait period
|
|
@@ -48196,7 +48192,7 @@ rollIcon - references the rollIcon (if set)
|
|
|
48196
48192
|
toggleObj - references the toggle object (string or display object if set)
|
|
48197
48193
|
rollToggle - references the rollToggle (if set)
|
|
48198
48194
|
toggled - true if button is in toggled state, false if button is in original state
|
|
48199
|
-
enabled - default is true - set to false to disable
|
|
48195
|
+
enabled - default is true - set to false to disable (the HTML aspect of the Loader will remail - so use loader.removeFrom() or loader.dispose() if you do not need it gain)
|
|
48200
48196
|
rollPersist - default is false - set to true to keep rollover state when button is pressed even if rolling off
|
|
48201
48197
|
focus - get or set the focus property of the Button used for tabOrder
|
|
48202
48198
|
|
|
@@ -63264,7 +63260,8 @@ arrowDisableColor - (default grey) the disabled backgroundColor of the ZIM Arrow
|
|
|
63264
63260
|
continuous - (default false) when default swiping is on, set to true to make pages continuous
|
|
63265
63261
|
so last page goes forward to first page and first page goes backwards to last page
|
|
63266
63262
|
|
|
63267
|
-
METHODS
|
|
63263
|
+
METHODS
|
|
63264
|
+
** these return the Pages object for chaining unless another value is specified
|
|
63268
63265
|
addPage(page, swipeArray) - lets you alternatively add pages after you create the object
|
|
63269
63266
|
removePage(page) - lets you remove a page (if on this page, call a go() first and remove on the page event)
|
|
63270
63267
|
setSwipeArray(page, swipeArray) - lets you set the swipe array for a page
|
|
@@ -63280,7 +63277,7 @@ settle() - removes all pages except the currentPage
|
|
|
63280
63277
|
setArrows(index) - disables or enables Arrow buttons held in arrows property - called automatically by Arrow buttons
|
|
63281
63278
|
disable() - stops swipe from activating and sets active = false
|
|
63282
63279
|
enable() - enables swipe action and sets active = true
|
|
63283
|
-
dispose() - clears listeners and pages
|
|
63280
|
+
dispose() - clears listeners and pages - returns true if successful
|
|
63284
63281
|
|
|
63285
63282
|
PROPERTIES
|
|
63286
63283
|
type - holds the class name as a String
|
|
@@ -63500,6 +63497,7 @@ you can define multiple pages objects add and remove pages objects as needed
|
|
|
63500
63497
|
} else {
|
|
63501
63498
|
if (page.parent) page.parent.removeChild(page);
|
|
63502
63499
|
}
|
|
63500
|
+
return that;
|
|
63503
63501
|
};
|
|
63504
63502
|
|
|
63505
63503
|
this.removePage = function(page) {
|
|
@@ -63513,19 +63511,23 @@ you can define multiple pages objects add and remove pages objects as needed
|
|
|
63513
63511
|
if (p.page == page || p == page) that.pages.splice(i, 1);
|
|
63514
63512
|
}, true);
|
|
63515
63513
|
page.zimSwipeArray = null;
|
|
63514
|
+
return that;
|
|
63516
63515
|
};
|
|
63517
63516
|
|
|
63518
63517
|
this.setSwipeArray = function(page, swipeArray) {
|
|
63519
63518
|
if (zot(swipeArray)) swipeArray = [];
|
|
63520
63519
|
var data = {page:page, swipe:swipeArray};
|
|
63521
63520
|
data.page.zimSwipeArray = (data.swipe) ? data.swipe : [];
|
|
63521
|
+
return that;
|
|
63522
63522
|
};
|
|
63523
63523
|
|
|
63524
63524
|
this.pause = function() {
|
|
63525
63525
|
paused = true;
|
|
63526
|
+
return that;
|
|
63526
63527
|
};
|
|
63527
63528
|
this.unpause = function() {
|
|
63528
63529
|
if (paused) that.go(pauseInfo[0], pauseInfo[1], pauseInfo[2], pauseInfo[3], pauseInfo[4]);
|
|
63530
|
+
return that;
|
|
63529
63531
|
};
|
|
63530
63532
|
|
|
63531
63533
|
var goCheck = true;
|
|
@@ -63836,6 +63838,7 @@ you can define multiple pages objects add and remove pages objects as needed
|
|
|
63836
63838
|
that.setArrows(pages.index);
|
|
63837
63839
|
if (holder.stage) holder.stage.update();
|
|
63838
63840
|
}
|
|
63841
|
+
return that;
|
|
63839
63842
|
};
|
|
63840
63843
|
|
|
63841
63844
|
if (holder && holder.shape) {
|
|
@@ -63848,6 +63851,7 @@ you can define multiple pages objects add and remove pages objects as needed
|
|
|
63848
63851
|
hW = holder.getBounds().width;
|
|
63849
63852
|
hH = holder.getBounds().height;
|
|
63850
63853
|
if (transition!="none" || transitionTable!=[]) makeTransitionAssets();
|
|
63854
|
+
return that;
|
|
63851
63855
|
};
|
|
63852
63856
|
|
|
63853
63857
|
this.puff = function(time) {
|
|
@@ -63862,20 +63866,24 @@ you can define multiple pages objects add and remove pages objects as needed
|
|
|
63862
63866
|
that.settle();
|
|
63863
63867
|
}, time*(timeType=="s"?1000:1));
|
|
63864
63868
|
}
|
|
63869
|
+
return that;
|
|
63865
63870
|
};
|
|
63866
63871
|
|
|
63867
63872
|
this.settle = function() {
|
|
63868
63873
|
that.removeAllChildren();
|
|
63869
63874
|
that.addChild(currentPage);
|
|
63870
63875
|
that.dispatchEvent("puffed");
|
|
63876
|
+
return that;
|
|
63871
63877
|
};
|
|
63872
63878
|
|
|
63873
63879
|
this.disable = function() {
|
|
63874
63880
|
that.active = false;
|
|
63881
|
+
return that;
|
|
63875
63882
|
};
|
|
63876
63883
|
|
|
63877
63884
|
this.enable = function() {
|
|
63878
63885
|
that.active = true;
|
|
63886
|
+
return that;
|
|
63879
63887
|
};
|
|
63880
63888
|
|
|
63881
63889
|
this.arrows = {};
|
|
@@ -63901,6 +63909,7 @@ you can define multiple pages objects add and remove pages objects as needed
|
|
|
63901
63909
|
}
|
|
63902
63910
|
});
|
|
63903
63911
|
if (that.stage) that.stage.update();
|
|
63912
|
+
return that;
|
|
63904
63913
|
}
|
|
63905
63914
|
// function arrowsOn(b) {
|
|
63906
63915
|
// b.enabled = true;
|
|
@@ -66311,8 +66320,10 @@ setSpacing(h,v) - set arrays of horizontal and vertical spacing
|
|
|
66311
66320
|
ZIM Tile() makes spacing arrays for horizontal and vertical spacing based on ZIM VEE calculations from the spacingH and spacingV parameters
|
|
66312
66321
|
to change spacing afterwards, new arrays can be provided to setSpacing()
|
|
66313
66322
|
the arrays must have col-1 and row-1 items - although h or v can be left null or undefined to keep existing spacing
|
|
66314
|
-
remake(items) - pass in an array of items to tile - see items property for editing current list - returns tile for chaining
|
|
66323
|
+
remake(items, newSpacingH, newSpacingV, newCount) - pass in an array of items to tile - see items property for editing current list - returns tile for chaining
|
|
66315
66324
|
can also change rows and cols and remake()
|
|
66325
|
+
optionally pass in new spacing parameters and/or a newCount
|
|
66326
|
+
Note: if the items length is different than the previous items length then the count will be automatically made cols*rows - unless newCount is provided
|
|
66316
66327
|
resize(width, height) - resize the tile with new width and/or height if the width and/or height parameters were set - returns tile for chaining
|
|
66317
66328
|
hasProp(property as String) - returns true if property exists on object else returns false
|
|
66318
66329
|
clone(exact) - makes a copy with properties such as x, y, etc. also copied
|
|
@@ -66542,6 +66553,8 @@ note: the item is not the event object target - as that is the tile
|
|
|
66542
66553
|
// remember any set widths and heights in case
|
|
66543
66554
|
// zik is used for colSize and rowSize
|
|
66544
66555
|
var widthHeights;
|
|
66556
|
+
var widthO;
|
|
66557
|
+
var heightO;
|
|
66545
66558
|
|
|
66546
66559
|
function makeTile() {
|
|
66547
66560
|
|
|
@@ -66633,11 +66646,11 @@ note: the item is not the event object target - as that is the tile
|
|
|
66633
66646
|
heightUncompressedMax+=val;
|
|
66634
66647
|
}
|
|
66635
66648
|
}
|
|
66636
|
-
|
|
66649
|
+
widthO = widthUncompressedMax;
|
|
66650
|
+
heightO = heightUncompressedMax;
|
|
66637
66651
|
}
|
|
66638
66652
|
makeTile();
|
|
66639
|
-
|
|
66640
|
-
var heightO = heightUncompressedMax;
|
|
66653
|
+
|
|
66641
66654
|
|
|
66642
66655
|
var overallWidth;
|
|
66643
66656
|
var overallHeight;
|
|
@@ -66727,11 +66740,13 @@ note: the item is not the event object target - as that is the tile
|
|
|
66727
66740
|
rowTops[i] = 0;
|
|
66728
66741
|
}
|
|
66729
66742
|
}
|
|
66743
|
+
|
|
66730
66744
|
|
|
66731
66745
|
if (i==0) {
|
|
66732
66746
|
|
|
66733
66747
|
// ~~~~~~~~~~~~~~~~~~~ HORIZONTAL ALIGN ~~~~~~~~~~~~~~~
|
|
66734
66748
|
|
|
66749
|
+
|
|
66735
66750
|
if (!zot(width)) {
|
|
66736
66751
|
if (that.squeezeH=="full") {
|
|
66737
66752
|
spreadXspacing = rowObjects.length>1?((width - widthTotals[j]) / (rowObjects.length-1)):0;
|
|
@@ -66769,16 +66784,16 @@ note: the item is not the event object target - as that is the tile
|
|
|
66769
66784
|
} else {
|
|
66770
66785
|
// tile.x = colTotal + (tile.regX-b.x);
|
|
66771
66786
|
}
|
|
66772
|
-
tile.pos(colTotal, null);
|
|
66787
|
+
tile.pos(colTotal, null);
|
|
66773
66788
|
|
|
66774
|
-
if (!that.squeezeH && VEEAlign) {
|
|
66789
|
+
if (!that.squeezeH && VEEAlign) {
|
|
66775
66790
|
if (zot(width) && (align=="center" || align=="middle")) {
|
|
66776
66791
|
tile.x += (widthMax[i]-tile.fW)/2;
|
|
66777
66792
|
} else if (zot(width) && align=="right") {
|
|
66778
66793
|
tile.x += widthMax[i]-tile.fW;
|
|
66779
66794
|
}
|
|
66780
|
-
} else if (!that.squeezeH) { // this allows for dynamic setting of align (for non-VEE, non squeezeH)
|
|
66781
|
-
if (zot(width) && (that.align=="center" || that.align=="middle")) {
|
|
66795
|
+
} else if (!that.squeezeH) { // this allows for dynamic setting of align (for non-VEE, non squeezeH)
|
|
66796
|
+
if (zot(width) && (that.align=="center" || that.align=="middle")) {
|
|
66782
66797
|
tile.x += (widthMax[i]-tile.fW)/2;
|
|
66783
66798
|
} else if (zot(width) && that.align=="right") {
|
|
66784
66799
|
tile.x += widthMax[i]-tile.fW;
|
|
@@ -66822,7 +66837,7 @@ note: the item is not the event object target - as that is the tile
|
|
|
66822
66837
|
} else {
|
|
66823
66838
|
colTotal += widthMax[i]+(!zot(width)?spreadXspacing:spacingHList[i]);
|
|
66824
66839
|
}
|
|
66825
|
-
|
|
66840
|
+
|
|
66826
66841
|
tile.x += left;
|
|
66827
66842
|
tile.y += rowTops[i];
|
|
66828
66843
|
|
|
@@ -66881,9 +66896,41 @@ note: the item is not the event object target - as that is the tile
|
|
|
66881
66896
|
return that.items2D[ro][co];
|
|
66882
66897
|
};
|
|
66883
66898
|
|
|
66884
|
-
this.remake = function(items) {
|
|
66899
|
+
this.remake = function(items, newSpacingH, newSpacingV, newCount) {
|
|
66900
|
+
|
|
66901
|
+
// a little complicated so we just remake the spacings if provided or items length has gotten bigger
|
|
66902
|
+
// if items length is different we create a new count - can override with newCount
|
|
66903
|
+
if (zot(newCount) && items.length != that.items.length) count = that.cols*that.rows;
|
|
66904
|
+
if (!zot(newSpacingH) || !zot(newSpacingV) || items.length > that.items.length) {
|
|
66905
|
+
if (!zot(newSpacingH)) spacingH = sH;
|
|
66906
|
+
if (!zot(newSpacingV)) spacingV = sV;
|
|
66907
|
+
spacingHList = [];
|
|
66908
|
+
spacingVList = [];
|
|
66909
|
+
spacingHTotal = 0;
|
|
66910
|
+
spacingVTotal = 0;
|
|
66911
|
+
mCols = (count && count<that.cols)?count-1:that.cols-1;
|
|
66912
|
+
for (i=0; i<mCols; i++) {
|
|
66913
|
+
var s = zik(spacingH);
|
|
66914
|
+
spacingHList.push(s);
|
|
66915
|
+
spacingHTotal += s;
|
|
66916
|
+
}
|
|
66917
|
+
mRows = (count && Math.ceil(count/that.cols)<that.rows)?Math.ceil(count/that.cols)-1:that.rows-1;
|
|
66918
|
+
for (i=0; i<mRows; i++) {
|
|
66919
|
+
var s = zik(spacingV);
|
|
66920
|
+
spacingVList.push(s);
|
|
66921
|
+
spacingVTotal += s;
|
|
66922
|
+
}
|
|
66923
|
+
spacingHOList = zim.copy(spacingHList);
|
|
66924
|
+
spacingVOList = zim.copy(spacingVList);;
|
|
66925
|
+
spacingHOTotal = spacingHTotal;
|
|
66926
|
+
spacingVOTotal = spacingVTotal;
|
|
66927
|
+
spacingHAve = that.cols-1>0?spacingHTotal/(that.cols-1):0
|
|
66928
|
+
spacingVAve = that.rows-1>0?spacingVTotal/(that.rows-1):0
|
|
66929
|
+
}
|
|
66930
|
+
|
|
66885
66931
|
if (!zot(items)) that.items = items;
|
|
66886
66932
|
makeTile();
|
|
66933
|
+
|
|
66887
66934
|
resize(width, height);
|
|
66888
66935
|
makeAdditions(true);
|
|
66889
66936
|
return that;
|
|
@@ -70280,7 +70327,7 @@ This has world-wide wonderful applications!
|
|
|
70280
70327
|
TextureActives applies the interactivity to TextureActive objects
|
|
70281
70328
|
and has an addMesh() method to register three.js meshes with their TextureActive
|
|
70282
70329
|
A TextureActives object must be made after the TextureActive objects are made
|
|
70283
|
-
and after a three.js renderer, scene, camera and
|
|
70330
|
+
and after a three.js renderer, scene, camera and controls are made.
|
|
70284
70331
|
But it can be made before the meshes that use the TextureActive objects are made.
|
|
70285
70332
|
Then either a Three.makePanel() or a textureActives.addMesh() method can be used to add TextureActive objects.
|
|
70286
70333
|
|
|
@@ -70304,6 +70351,10 @@ https://zimjs.com/015/textureactive5.html - Physics
|
|
|
70304
70351
|
https://zimjs.com/015/textureactive_hud.html - HUD affecting three object
|
|
70305
70352
|
https://zimjs.com/015/textureactive_hud_raw.html - same but without ZIM Three
|
|
70306
70353
|
|
|
70354
|
+
SEE:
|
|
70355
|
+
TextureActive Studio
|
|
70356
|
+
https://zimjs.com/studio
|
|
70357
|
+
|
|
70307
70358
|
XR
|
|
70308
70359
|
TextureActive will detect if XR (AR/VR) is being used and will use the suitable Raycaster
|
|
70309
70360
|
Additional classes are provided with the ZIM Three helper library for controllers, movement and teleport
|
|
@@ -74376,7 +74427,6 @@ dispatches a "moving" event if target is moving and "startmoving" and "stopmovin
|
|
|
74376
74427
|
if (target.type == "Pen") target.write = false;
|
|
74377
74428
|
mouseEvent = stage.on("stagemousedown", function(e) {
|
|
74378
74429
|
var pp;
|
|
74379
|
-
if (target.type == "Pen" && target.draggingCheck) zogb();
|
|
74380
74430
|
var con;
|
|
74381
74431
|
if (!mouseOutside && that.boundary && !that.boundary.type=="Blob") con = that.boundary;
|
|
74382
74432
|
else if (!mouseOutside && container && container.boundsToGlobal) con = container.boundsToGlobal();
|
|
@@ -74385,9 +74435,11 @@ dispatches a "moving" event if target is moving and "startmoving" and "stopmovin
|
|
|
74385
74435
|
if (
|
|
74386
74436
|
pp.x < con.x || pp.x > con.x+con.width ||
|
|
74387
74437
|
pp.y < con.y || pp.y > con.y+con.height
|
|
74388
|
-
)
|
|
74438
|
+
) {
|
|
74439
|
+
moveCheck = false;
|
|
74440
|
+
return;
|
|
74441
|
+
}
|
|
74389
74442
|
}
|
|
74390
|
-
// }
|
|
74391
74443
|
if (that.boundary && that.boundary.type=="Blob" && (type=="pressmove" || type=="pressdrag")) {
|
|
74392
74444
|
pp = {x:e.stageX/zim.scaX, y:e.stageY/zim.scaY};
|
|
74393
74445
|
if (!that.boundary.shape.hitTestPoint(pp.x,pp.y)) return;
|
|
@@ -83182,7 +83234,6 @@ dispatches an "undo" and a "redo" whenever undo and redo happens
|
|
|
83182
83234
|
that.stop = function() {that.stopCheck(true);};
|
|
83183
83235
|
that.infinite = false;
|
|
83184
83236
|
that.stopCheck = function(override) {
|
|
83185
|
-
|
|
83186
83237
|
if (!override) {
|
|
83187
83238
|
if (that.infinite) return;
|
|
83188
83239
|
if (that.zimDragCheck) return;
|
|
@@ -91399,6 +91450,7 @@ new Circle(100, blue.darken(.5)).center();
|
|
|
91399
91450
|
new Circle(100, blue.toColor(red, .2)).center();
|
|
91400
91451
|
END EXAMPLE
|
|
91401
91452
|
--*///+83.55
|
|
91453
|
+
// note - first 9 or 10 colors are used in THEME
|
|
91402
91454
|
zim.colorsHex = ["#fb4758","#fa8072","#f58e25","#ebcb35","#acd241","#50c4b7","#993399","#e472c4","#d1a170","#112233","#000000","#111111","#222222","#333333","#444444","#555555","#555555","#666666","#777777","#888888","#999999","#aaaaaa","#bbbbbb","#cccccc","#dddddd","#eeeeee","#ffffff","rgba(0,0,0,.01)","rgba(0,0,0,0)"];
|
|
91403
91455
|
zim.colors = ["red","salmon","orange","yellow","green","blue","purple","pink","brown","interstellar","black","darker","licorice","dark","charcoal","grey","gray","granite","tin","pewter","silver","fog","mist","light","moon","lighter","white","faint","clear"];
|
|
91404
91456
|
for (z_i=0; z_i<zim.colors.length; z_i++) {
|
|
@@ -94532,9 +94584,9 @@ THEME - a Theme object literal with name, lightnessRatio, tint, tintRatio and ex
|
|
|
94532
94584
|
zim.THEME = window.THEME = {name:theme, lightenRatio:lightenRatio, tint:tint, tintRatio:tintRatio, exclude:exclude};
|
|
94533
94585
|
var colors = {};
|
|
94534
94586
|
var c;
|
|
94535
|
-
var cn = zim.colors.slice(0,
|
|
94536
|
-
// ["red", "orange", "yellow", "green", "blue", "purple", "pink", "brown", "interstellar"];
|
|
94537
|
-
var gn = zim.colors.slice(
|
|
94587
|
+
var cn = zim.colors.slice(0,9);
|
|
94588
|
+
// ["red", "salmon", "orange", "yellow", "green", "blue", "purple", "pink", "brown", "interstellar"];
|
|
94589
|
+
var gn = zim.colors.slice(9,26);
|
|
94538
94590
|
// ["black","licorice","darker","dark","charcoal","grey","gray","granite","tin","pewter","silver","fog","mist","light","moon","lighter","white"];
|
|
94539
94591
|
if (theme == "zim") {
|
|
94540
94592
|
zim.loop(zim.colors, function(color, i) {
|
|
@@ -94549,12 +94601,12 @@ THEME - a Theme object literal with name, lightnessRatio, tint, tintRatio and ex
|
|
|
94549
94601
|
colors[color] = zim.colorsHex[i+8];
|
|
94550
94602
|
});
|
|
94551
94603
|
} else if (theme == "future") {
|
|
94552
|
-
c = ["f25019","fd8918","ffc955","1dcfae","00a5ab","007175","00969b","d6b361"];
|
|
94604
|
+
c = ["f25019","f88e82","fd8918","ffc955","1dcfae","00a5ab","007175","00969b","d6b361"];
|
|
94553
94605
|
zim.loop(cn, function(color, i) {
|
|
94554
94606
|
colors[color] = "#"+c[i];
|
|
94555
94607
|
});
|
|
94556
94608
|
zim.loop(gn, function(color, i) {
|
|
94557
|
-
colors[color] = zim.colorsHex[i+
|
|
94609
|
+
colors[color] = zim.colorsHex[i+9].toColor("#1dcfae",.4-i*.025);
|
|
94558
94610
|
});
|
|
94559
94611
|
} else if (theme == "invert") {
|
|
94560
94612
|
colors = {};
|
|
@@ -94568,34 +94620,34 @@ THEME - a Theme object literal with name, lightnessRatio, tint, tintRatio and ex
|
|
|
94568
94620
|
colors[color] = "#"+c[i];
|
|
94569
94621
|
});
|
|
94570
94622
|
} else if (theme == "neon") {
|
|
94571
|
-
c = ["FF3624","ff6f00","e2f705","a3f307","05f9e2","ED0AF5","ff33c9","e16d00"];
|
|
94623
|
+
c = ["FF3624","fd6f6f","ff6f00","e2f705","a3f307","05f9e2","ED0AF5","ff33c9","e16d00"];
|
|
94572
94624
|
zim.loop(cn, function(color, i) {
|
|
94573
94625
|
colors[color] = "#"+c[i];
|
|
94574
94626
|
});
|
|
94575
94627
|
zim.loop(gn, function(color, i) {
|
|
94576
|
-
colors[color] = zim.colorsHex[i+
|
|
94628
|
+
colors[color] = zim.colorsHex[i+9].toColor("#000",.9);
|
|
94577
94629
|
});
|
|
94578
94630
|
colors["light"] = zim.lighter;
|
|
94579
94631
|
colors["moon"] = zim.lighter;
|
|
94580
94632
|
colors["lighter"] = zim.white;
|
|
94581
94633
|
colors["white"] = zim.white;
|
|
94582
94634
|
} else if (theme == "seventies") {
|
|
94583
|
-
c = ["e5771e","f4a127","ffecb4","6F8212","75c8ae","5a3d2b","956e4e","4c3607"];
|
|
94635
|
+
c = ["e5771e","d66a5e","f4a127","ffecb4","6F8212","75c8ae","5a3d2b","956e4e","4c3607"];
|
|
94584
94636
|
zim.loop(cn, function(color, i) {
|
|
94585
94637
|
colors[color] = "#"+c[i];
|
|
94586
94638
|
});
|
|
94587
94639
|
zim.loop(gn, function(color, i) {
|
|
94588
94640
|
// colors[color] = zim.colorsHex[i+8].toColor("#568203",1-i*.06);
|
|
94589
|
-
colors[color] = zim.colorsHex[i+
|
|
94641
|
+
colors[color] = zim.colorsHex[i+9].toColor(i<8?"#344f00":"#f4a127",.8-i*.04);
|
|
94590
94642
|
});
|
|
94591
94643
|
} else if (theme == "warm") {
|
|
94592
|
-
c = ["965746","c07768","ffecb4","8da279","6da0b1","745c58","9a7e79","be8858"];
|
|
94644
|
+
c = ["965746","dd5c4d","c07768","ffecb4","8da279","6da0b1","745c58","9a7e79","be8858"];
|
|
94593
94645
|
zim.loop(cn, function(color, i) {
|
|
94594
94646
|
colors[color] = "#"+c[i];
|
|
94595
94647
|
});
|
|
94596
94648
|
zim.loop(gn, function(color, i) {
|
|
94597
94649
|
// colors[color] = zim.colorsHex[i+8].toColor("#965746",.1);
|
|
94598
|
-
colors[color] = zim.colorsHex[i+
|
|
94650
|
+
colors[color] = zim.colorsHex[i+9].toColor(i<8?"#4e352e":"#745c58",.8-i*.05);
|
|
94599
94651
|
});
|
|
94600
94652
|
} else if (theme.constructor == {}.constructor) {
|
|
94601
94653
|
colors = theme;
|
|
@@ -94606,12 +94658,12 @@ THEME - a Theme object literal with name, lightnessRatio, tint, tintRatio and ex
|
|
|
94606
94658
|
zim.loop(exclude, function(item) {
|
|
94607
94659
|
if (item.toLowerCase()=="colors") {
|
|
94608
94660
|
zim.loop(zim.colors, function(color, i) {
|
|
94609
|
-
if (i >=
|
|
94661
|
+
if (i >= 9) return 1;
|
|
94610
94662
|
exclude.push(color);
|
|
94611
94663
|
});
|
|
94612
94664
|
} else if (item.toLowerCase()=="greys" || item.toLowerCase()=="grays") {
|
|
94613
94665
|
zim.loop(zim.colors, function(color, i) {
|
|
94614
|
-
if (i <
|
|
94666
|
+
if (i < 9) return;
|
|
94615
94667
|
exclude.push(color);
|
|
94616
94668
|
});
|
|
94617
94669
|
}
|
|
@@ -98093,4 +98145,3 @@ export let Style = zim.Style;
|
|
|
98093
98145
|
export let assets = zim.assets;
|
|
98094
98146
|
export let assetIDs = zim.assetIDs;
|
|
98095
98147
|
export let ZIMON = zim.ZIMON;
|
|
98096
|
-
|
|
@@ -3138,17 +3138,17 @@ declare namespace zim {
|
|
|
3138
3138
|
export class Pages extends Container {
|
|
3139
3139
|
constructor(config_or_pages?: DisplayObject[] | { page: DisplayObject, swipe?: DisplayObject[] }[], transition?: string, speed?: number, transitionTable?: any[][], holder?: Stage | Container, arrowDisableColor?: color, style?: boolean, group?: string, inherit?: {})
|
|
3140
3140
|
constructor(config: { pages?: DisplayObject[] | { page: DisplayObject, swipe?: DisplayObject[] }[], transition?: string, speed?: number, transitionTable?: any[][], holder?: Stage | Container, arrowDisableColor?: color, style?: boolean, group?: string, inherit?: {} })
|
|
3141
|
-
addPage(page: DisplayObject, swipeArray?: string[]):
|
|
3142
|
-
removePage(page: DisplayObject):
|
|
3143
|
-
setSwipeArray(page: DisplayObject, swipeArray?: string[]):
|
|
3144
|
-
go(newPage: DisplayObject | number, direction: string, trans?: string, ms?: number):
|
|
3145
|
-
resize():
|
|
3146
|
-
pause():
|
|
3147
|
-
unpause():
|
|
3148
|
-
puff(time: number):
|
|
3149
|
-
settle():
|
|
3150
|
-
disable():
|
|
3151
|
-
enable():
|
|
3141
|
+
addPage(page: DisplayObject, swipeArray?: string[]): this
|
|
3142
|
+
removePage(page: DisplayObject): this
|
|
3143
|
+
setSwipeArray(page: DisplayObject, swipeArray?: string[]): this
|
|
3144
|
+
go(newPage: DisplayObject | number, direction: string, trans?: string, ms?: number): this
|
|
3145
|
+
resize(): this
|
|
3146
|
+
pause(): this
|
|
3147
|
+
unpause(): this
|
|
3148
|
+
puff(time: number): this
|
|
3149
|
+
settle(): this
|
|
3150
|
+
disable(): this
|
|
3151
|
+
enable(): this
|
|
3152
3152
|
dispose(): boolean
|
|
3153
3153
|
readonly type: string
|
|
3154
3154
|
speed: number
|