@bbki.ng/components 1.5.46 → 1.5.47

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.
Files changed (3) hide show
  1. package/dist/index.js +33 -22
  2. package/dist/index.mjs +33 -22
  3. package/package.json +1 -1
package/dist/index.js CHANGED
@@ -1087,32 +1087,40 @@ var VERTEX_SHADER = `
1087
1087
  uniform mat4 uViewMatrix;
1088
1088
  uniform float uProgress;
1089
1089
  varying vec3 vColor;
1090
- mat4 rotate(float _angle){
1090
+ mat4 rotateX(float _angle){
1091
1091
  return mat4(
1092
- cos(_angle),-sin(_angle), 0.0, 0.0,
1093
- sin(_angle),cos(_angle), 0.0, 0.0,
1094
- 0.0, 0.0, 0.0, 0.0,
1092
+ 1.0, 0.0, 0.0, 0.0,
1093
+ 0.0, cos(_angle), -sin(_angle), 0.0,
1094
+ 0.0, sin(_angle), cos(_angle), 0.0,
1095
1095
  0.0, 0.0, 0.0, 1.0
1096
1096
  );
1097
1097
  }
1098
- mat4 translateY(float _offset){
1098
+ mat4 rotateY(float _angle){
1099
1099
  return mat4(
1100
- 1.0, 0.0, 0.0, 0.0,
1101
- 0.0, 1.0, 0.0, -1.0 * _offset,
1100
+ cos(_angle), 0.0, sin(_angle), 0.0,
1101
+ 0.0, 1.0, 0.0, 0.0,
1102
+ -sin(_angle), 0.0, cos(_angle), 0.0,
1103
+ 0.0, 0.0, 0.0, 1.0
1104
+ );
1105
+ }
1106
+ mat4 rotateZ(float _angle){
1107
+ return mat4(
1108
+ cos(_angle), -sin(_angle), 0.0, 0.0,
1109
+ sin(_angle), cos(_angle), 0.0, 0.0,
1102
1110
  0.0, 0.0, 1.0, 0.0,
1103
1111
  0.0, 0.0, 0.0, 1.0
1104
1112
  );
1105
1113
  }
1106
- mat4 translate(float _angle){
1114
+ mat4 translateY(float _offset){
1107
1115
  return mat4(
1108
- 1.0, 0.0, 0.0, sin(_angle) * 0.02,
1109
- 0.0, 1.0, 0.0, cos(_angle) * 0.02,
1116
+ 1.0, 0.0, 0.0, 0.0,
1117
+ 0.0, 1.0, 0.0, -1.0 * _offset,
1110
1118
  0.0, 0.0, 1.0, 0.0,
1111
1119
  0.0, 0.0, 0.0, 1.0
1112
1120
  );
1113
1121
  }
1114
1122
  void main(){
1115
- gl_Position = rotate(uProgress) * uProjectionMatrix * uModelMatrix * uViewMatrix * vec4(${"aPositionStart" /* POSITION_START */}, 1.0) * translate(uProgress) * translateY(${"aOffsetY" /* OFFSET_Y */});
1123
+ gl_Position = uProjectionMatrix * uModelMatrix * uViewMatrix * rotateX(uProgress) * vec4(${"aPositionStart" /* POSITION_START */}, 1.0) * translateY(${"aOffsetY" /* OFFSET_Y */});
1116
1124
  gl_PointSize = 1.0;
1117
1125
  vColor = ${"aColor" /* COLOR */};
1118
1126
  }
@@ -1128,10 +1136,6 @@ var FRAGMENT_SHADER = `
1128
1136
  `;
1129
1137
 
1130
1138
  // src/loading-spiral/utils.ts
1131
- var scaleIndex = (multiplier, max) => (index) => {
1132
- return index / (multiplier / max);
1133
- };
1134
- var scaleIndex2ang = (multiplier) => scaleIndex(multiplier, 360);
1135
1139
  var rgba = (val) => {
1136
1140
  const [r, g, b, a] = val;
1137
1141
  return [r / 255, g / 255, b / 255, a];
@@ -1156,13 +1160,20 @@ var createOptions = (opt = DEFAULT_OPT) => {
1156
1160
  const attributes = [
1157
1161
  {
1158
1162
  name: "aPositionStart" /* POSITION_START */,
1159
- data: (index) => {
1160
- const ang = scaleIndex2ang(multiplier)(index);
1161
- const A = spiralConstA;
1162
- const B = spiralConstB;
1163
- const xPos = A * Math.pow(Math.E, B * ang) * Math.cos(ang);
1164
- const yPos = A * Math.pow(Math.E, B * ang) * Math.sin(ang);
1165
- return [xPos, yPos, 1];
1163
+ data: (index, total) => {
1164
+ const percent = index / total;
1165
+ const length = 0.28;
1166
+ const radius = 0.056;
1167
+ const pi2 = Math.PI * 2;
1168
+ let x = length * Math.sin(pi2 * percent), y = radius * Math.cos(pi2 * 3 * percent), z, t;
1169
+ t = percent % 0.25 / 0.25;
1170
+ t = percent % 0.25 - (2 * (1 - t) * t * -0.0185 + t * t * 0.25);
1171
+ if (Math.floor(percent / 0.25) == 0 || Math.floor(percent / 0.25) == 2) {
1172
+ console.log("neg t");
1173
+ t *= -1;
1174
+ }
1175
+ z = radius * Math.sin(pi2 * 2 * (percent - t));
1176
+ return [x, y, z];
1166
1177
  },
1167
1178
  size: 3
1168
1179
  },
package/dist/index.mjs CHANGED
@@ -1029,32 +1029,40 @@ var VERTEX_SHADER = `
1029
1029
  uniform mat4 uViewMatrix;
1030
1030
  uniform float uProgress;
1031
1031
  varying vec3 vColor;
1032
- mat4 rotate(float _angle){
1032
+ mat4 rotateX(float _angle){
1033
1033
  return mat4(
1034
- cos(_angle),-sin(_angle), 0.0, 0.0,
1035
- sin(_angle),cos(_angle), 0.0, 0.0,
1036
- 0.0, 0.0, 0.0, 0.0,
1034
+ 1.0, 0.0, 0.0, 0.0,
1035
+ 0.0, cos(_angle), -sin(_angle), 0.0,
1036
+ 0.0, sin(_angle), cos(_angle), 0.0,
1037
1037
  0.0, 0.0, 0.0, 1.0
1038
1038
  );
1039
1039
  }
1040
- mat4 translateY(float _offset){
1040
+ mat4 rotateY(float _angle){
1041
1041
  return mat4(
1042
- 1.0, 0.0, 0.0, 0.0,
1043
- 0.0, 1.0, 0.0, -1.0 * _offset,
1042
+ cos(_angle), 0.0, sin(_angle), 0.0,
1043
+ 0.0, 1.0, 0.0, 0.0,
1044
+ -sin(_angle), 0.0, cos(_angle), 0.0,
1045
+ 0.0, 0.0, 0.0, 1.0
1046
+ );
1047
+ }
1048
+ mat4 rotateZ(float _angle){
1049
+ return mat4(
1050
+ cos(_angle), -sin(_angle), 0.0, 0.0,
1051
+ sin(_angle), cos(_angle), 0.0, 0.0,
1044
1052
  0.0, 0.0, 1.0, 0.0,
1045
1053
  0.0, 0.0, 0.0, 1.0
1046
1054
  );
1047
1055
  }
1048
- mat4 translate(float _angle){
1056
+ mat4 translateY(float _offset){
1049
1057
  return mat4(
1050
- 1.0, 0.0, 0.0, sin(_angle) * 0.02,
1051
- 0.0, 1.0, 0.0, cos(_angle) * 0.02,
1058
+ 1.0, 0.0, 0.0, 0.0,
1059
+ 0.0, 1.0, 0.0, -1.0 * _offset,
1052
1060
  0.0, 0.0, 1.0, 0.0,
1053
1061
  0.0, 0.0, 0.0, 1.0
1054
1062
  );
1055
1063
  }
1056
1064
  void main(){
1057
- gl_Position = rotate(uProgress) * uProjectionMatrix * uModelMatrix * uViewMatrix * vec4(${"aPositionStart" /* POSITION_START */}, 1.0) * translate(uProgress) * translateY(${"aOffsetY" /* OFFSET_Y */});
1065
+ gl_Position = uProjectionMatrix * uModelMatrix * uViewMatrix * rotateX(uProgress) * vec4(${"aPositionStart" /* POSITION_START */}, 1.0) * translateY(${"aOffsetY" /* OFFSET_Y */});
1058
1066
  gl_PointSize = 1.0;
1059
1067
  vColor = ${"aColor" /* COLOR */};
1060
1068
  }
@@ -1070,10 +1078,6 @@ var FRAGMENT_SHADER = `
1070
1078
  `;
1071
1079
 
1072
1080
  // src/loading-spiral/utils.ts
1073
- var scaleIndex = (multiplier, max) => (index) => {
1074
- return index / (multiplier / max);
1075
- };
1076
- var scaleIndex2ang = (multiplier) => scaleIndex(multiplier, 360);
1077
1081
  var rgba = (val) => {
1078
1082
  const [r, g, b, a] = val;
1079
1083
  return [r / 255, g / 255, b / 255, a];
@@ -1098,13 +1102,20 @@ var createOptions = (opt = DEFAULT_OPT) => {
1098
1102
  const attributes = [
1099
1103
  {
1100
1104
  name: "aPositionStart" /* POSITION_START */,
1101
- data: (index) => {
1102
- const ang = scaleIndex2ang(multiplier)(index);
1103
- const A = spiralConstA;
1104
- const B = spiralConstB;
1105
- const xPos = A * Math.pow(Math.E, B * ang) * Math.cos(ang);
1106
- const yPos = A * Math.pow(Math.E, B * ang) * Math.sin(ang);
1107
- return [xPos, yPos, 1];
1105
+ data: (index, total) => {
1106
+ const percent = index / total;
1107
+ const length = 0.28;
1108
+ const radius = 0.056;
1109
+ const pi2 = Math.PI * 2;
1110
+ let x = length * Math.sin(pi2 * percent), y = radius * Math.cos(pi2 * 3 * percent), z, t;
1111
+ t = percent % 0.25 / 0.25;
1112
+ t = percent % 0.25 - (2 * (1 - t) * t * -0.0185 + t * t * 0.25);
1113
+ if (Math.floor(percent / 0.25) == 0 || Math.floor(percent / 0.25) == 2) {
1114
+ console.log("neg t");
1115
+ t *= -1;
1116
+ }
1117
+ z = radius * Math.sin(pi2 * 2 * (percent - t));
1118
+ return [x, y, z];
1108
1119
  },
1109
1120
  size: 3
1110
1121
  },
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@bbki.ng/components",
3
- "version": "1.5.46",
3
+ "version": "1.5.47",
4
4
  "main": "./dist/index.js",
5
5
  "module": "./dist/index.mjs",
6
6
  "types": "./dist/index.d.ts",