stpete2 commited on
Commit
a7ac364
·
verified ·
1 Parent(s): 520b1a5

Upload preprocess_manual.js

Browse files
Files changed (1) hide show
  1. preprocess_manual.js +136 -115
preprocess_manual.js CHANGED
@@ -1107,143 +1107,164 @@ parser.parsePLY(gsPath, true).then((plyData) => {
1107
 
1108
  if (shouldNormalize) {
1109
  console.log('[preprocessManual] ===== STARTING AUTO-ALIGNMENT =====');
 
1110
 
1111
- const { center } = pcaResult;
1112
-
1113
- // ========================================
1114
- // STEP 1: 中心化(1回だけ実行)
1115
- // ========================================
1116
 
1117
- /////////////////////////////12/16 19:00
1118
 
1119
- console.log('[preprocessManual] Step 1: Centering PLY...');
 
 
 
 
1120
 
1121
- // ⭐⭐⭐ BEFORE - 診断 ⭐⭐⭐
1122
- console.log('[DEBUG] First vertex BEFORE:', {
1123
- x: plyData.vertices[0].x.toFixed(3),
1124
- y: plyData.vertices[0].y.toFixed(3),
1125
- z: plyData.vertices[0].z.toFixed(3)
1126
- });
1127
 
 
 
 
 
 
1128
 
1129
- plyData.vertices = plyData.vertices.map(v => {
1130
- // 新しいオブジェクトを作成
1131
- const centered = {
1132
- x: v.x - center.x,
1133
- y: v.y - center.y,
1134
- z: v.z - center.z
1135
- };
1136
-
1137
- // 重要: 他のすべてのプロパティをコピー
1138
- // Object.keys() を使って確実にすべてをコピー
1139
- Object.keys(v).forEach(key => {
1140
- if (key !== 'x' && key !== 'y' && key !== 'z') {
1141
- centered[key] = v[key];
1142
- }
1143
- });
1144
-
1145
- return centered;
1146
- });
1147
-
1148
- // ⭐⭐⭐ AFTER - 確認 ⭐⭐⭐
1149
- console.log('[DEBUG] First vertex AFTER:', {
1150
- x: plyData.vertices[0].x.toFixed(3),
1151
- y: plyData.vertices[0].y.toFixed(3),
1152
- z: plyData.vertices[0].z.toFixed(3)
1153
  });
 
 
 
1154
 
1155
- // ⭐⭐⭐ 平均を計算(ほぼ0になるはず) ⭐⭐⭐
1156
- let sumX = 0, sumY = 0, sumZ = 0;
1157
- plyData.vertices.forEach(v => {
1158
- sumX += v.x;
1159
- sumY += v.y;
1160
- sumZ += v.z;
1161
- });
1162
- const avgX = sumX / plyData.vertices.length;
1163
- const avgY = sumY / plyData.vertices.length;
1164
- const avgZ = sumZ / plyData.vertices.length;
1165
-
1166
- console.log('[DEBUG] Average after centering:', {
1167
- x: avgX.toFixed(6),
1168
- y: avgY.toFixed(6),
1169
- z: avgZ.toFixed(6)
1170
- });
1171
 
1172
- if (Math.abs(avgX) > 0.001 || Math.abs(avgY) > 0.001 || Math.abs(avgZ) > 0.001) {
1173
- console.error('[DEBUG] ERROR: Centering FAILED!');
1174
- console.error('[DEBUG] Average is not zero:', { avgX, avgY, avgZ });
1175
- } else {
1176
- console.log('[DEBUG] Centering SUCCESS! Average is ~0');
1177
- }
 
 
 
 
 
 
 
 
 
1178
 
1179
- console.log('[preprocessManual] PLY centered at origin');
1180
-
1181
- // ⭐⭐⭐ センタリング後の中心を保存 ⭐⭐⭐
1182
- const centeredCenter = { x: 0, y: 0, z: 0 }; // センタリング後は必ず 0,0,0
 
 
1183
 
1184
- /////////////////10:08
1185
 
1186
- ////////////10:25 start
 
 
 
1187
 
1188
- // ========================================
1189
- // STEP 2: バウンディングボックスを再計算
1190
- // ========================================
1191
- console.log('[preprocessManual] Step 2: Recalculating bounding box...');
1192
-
1193
- // ⭐⭐⭐ let に変更してスコープを広げる ⭐⭐⭐
1194
- let minX = Infinity, minY = Infinity, minZ = Infinity;
1195
- let maxX = -Infinity, maxY = -Infinity, maxZ = -Infinity;
1196
-
1197
- plyData.vertices.forEach(v => {
1198
- minX = Math.min(minX, v.x);
1199
- minY = Math.min(minY, v.y);
1200
- minZ = Math.min(minZ, v.z);
1201
- maxX = Math.max(maxX, v.x);
1202
- maxY = Math.max(maxY, v.y);
1203
- maxZ = Math.max(maxZ, v.z);
1204
- });
1205
 
1206
- // ⭐⭐⭐ let に変更してスコープを広げる ⭐⭐⭐
1207
- let sizeX = maxX - minX;
1208
- let sizeY = maxY - minY;
1209
- let sizeZ = maxZ - minZ;
 
 
 
 
1210
 
1211
- console.log('[preprocessManual] Centered sizes:', {
1212
- sizeX: sizeX.toFixed(2),
1213
- sizeY: sizeY.toFixed(2),
1214
- sizeZ: sizeZ.toFixed(2)
1215
- });
1216
 
1217
- ////////////10:25 end
 
 
 
 
1218
 
1219
- // ========================================
1220
- // STEP 3: Y軸が最長になるように回転
1221
- // ========================================
1222
- console.log('[preprocessManual] Step 3: Checking if rotation is needed...');
1223
- console.log('[preprocessManual] Longest axis:',
1224
- sizeX > sizeY && sizeX > sizeZ ? 'X' :
1225
- sizeZ > sizeY ? 'Z' : 'Y');
 
 
 
1226
 
1227
- let rotationNeeded = new THREE.Matrix4(); // Identity matrix
1228
- let rotationApplied = false;
1229
-
1230
- if (sizeX > sizeY && sizeX > sizeZ) {
1231
- // X軸が最長 Y軸に回転
1232
- console.log('[preprocessManual] ⚙️ Rotating: X → Y (90° around Z axis)');
1233
- rotationNeeded.makeRotationZ(Math.PI / 2);
1234
- rotationApplied = true;
1235
 
1236
- } else if (sizeZ > sizeY && sizeZ > sizeX) {
1237
- // Z軸が最長 → Y軸に回転
1238
- console.log('[preprocessManual] ⚙️ Rotating: Z → Y (90° around X axis)');
1239
- rotationNeeded.makeRotationX(Math.PI / 2);
1240
- rotationApplied = true;
 
 
 
 
 
 
1241
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1242
  } else {
1243
- // Y軸がすでに最長
1244
- console.log('[preprocessManual] ✓ Y-axis is already the longest, no rotation needed');
1245
  }
1246
-
 
 
 
 
 
1247
  // ========================================
1248
  // STEP 4: 回転を適用(必要な場合のみ)
1249
  // ========================================
 
1107
 
1108
  if (shouldNormalize) {
1109
  console.log('[preprocessManual] ===== STARTING AUTO-ALIGNMENT =====');
1110
+ ///////////////10:32 start
1111
 
1112
+ console.log('[preprocessManual] ===== STARTING AUTO-ALIGNMENT =====');
 
 
 
 
1113
 
1114
+ const { center } = pcaResult;
1115
 
1116
+ // ========================================
1117
+ // ⭐⭐⭐ 変数を最初に宣言(ifブロックの外側) ⭐⭐⭐
1118
+ // ========================================
1119
+ let sizeX, sizeY, sizeZ;
1120
+ let minX, maxX, minY, maxY, minZ, maxZ;
1121
 
1122
+ // ========================================
1123
+ // STEP 1: 中心化(1回だけ実行)
1124
+ // ========================================
1125
+ console.log('[preprocessManual] Step 1: Centering PLY...');
 
 
1126
 
1127
+ console.log('[DEBUG] First vertex BEFORE:', {
1128
+ x: plyData.vertices[0].x.toFixed(3),
1129
+ y: plyData.vertices[0].y.toFixed(3),
1130
+ z: plyData.vertices[0].z.toFixed(3)
1131
+ });
1132
 
1133
+ plyData.vertices = plyData.vertices.map(v => {
1134
+ const centered = {
1135
+ x: v.x - center.x,
1136
+ y: v.y - center.y,
1137
+ z: v.z - center.z
1138
+ };
1139
+
1140
+ Object.keys(v).forEach(key => {
1141
+ if (key !== 'x' && key !== 'y' && key !== 'z') {
1142
+ centered[key] = v[key];
1143
+ }
 
 
 
 
 
 
 
 
 
 
 
 
 
1144
  });
1145
+
1146
+ return centered;
1147
+ });
1148
 
1149
+ console.log('[DEBUG] First vertex AFTER:', {
1150
+ x: plyData.vertices[0].x.toFixed(3),
1151
+ y: plyData.vertices[0].y.toFixed(3),
1152
+ z: plyData.vertices[0].z.toFixed(3)
1153
+ });
 
 
 
 
 
 
 
 
 
 
 
1154
 
1155
+ let sumX = 0, sumY = 0, sumZ = 0;
1156
+ plyData.vertices.forEach(v => {
1157
+ sumX += v.x;
1158
+ sumY += v.y;
1159
+ sumZ += v.z;
1160
+ });
1161
+ const avgX = sumX / plyData.vertices.length;
1162
+ const avgY = sumY / plyData.vertices.length;
1163
+ const avgZ = sumZ / plyData.vertices.length;
1164
+
1165
+ console.log('[DEBUG] Average after centering:', {
1166
+ x: avgX.toFixed(6),
1167
+ y: avgY.toFixed(6),
1168
+ z: avgZ.toFixed(6)
1169
+ });
1170
 
1171
+ if (Math.abs(avgX) > 0.001 || Math.abs(avgY) > 0.001 || Math.abs(avgZ) > 0.001) {
1172
+ console.error('[DEBUG] ❌ ERROR: Centering FAILED!');
1173
+ console.error('[DEBUG] Average is not zero:', { avgX, avgY, avgZ });
1174
+ } else {
1175
+ console.log('[DEBUG] ✓ Centering SUCCESS! Average is ~0');
1176
+ }
1177
 
1178
+ console.log('[preprocessManual] ✓ PLY centered at origin');
1179
 
1180
+ // ========================================
1181
+ // STEP 2: バウンディングボックスを再計算
1182
+ // ========================================
1183
+ console.log('[preprocessManual] Step 2: Recalculating bounding box...');
1184
 
1185
+ minX = Infinity; minY = Infinity; minZ = Infinity;
1186
+ maxX = -Infinity; maxY = -Infinity; maxZ = -Infinity;
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1187
 
1188
+ plyData.vertices.forEach(v => {
1189
+ minX = Math.min(minX, v.x);
1190
+ minY = Math.min(minY, v.y);
1191
+ minZ = Math.min(minZ, v.z);
1192
+ maxX = Math.max(maxX, v.x);
1193
+ maxY = Math.max(maxY, v.y);
1194
+ maxZ = Math.max(maxZ, v.z);
1195
+ });
1196
 
1197
+ sizeX = maxX - minX;
1198
+ sizeY = maxY - minY;
1199
+ sizeZ = maxZ - minZ;
 
 
1200
 
1201
+ console.log('[preprocessManual] Centered sizes:', {
1202
+ sizeX: sizeX.toFixed(2),
1203
+ sizeY: sizeY.toFixed(2),
1204
+ sizeZ: sizeZ.toFixed(2)
1205
+ });
1206
 
1207
+ // ========================================
1208
+ // STEP 3: Y軸が最長になるように回転(条件付き)
1209
+ // ========================================
1210
+ if (pcaResult.needsRotation) {
1211
+ const shouldNormalize = confirm(
1212
+ '⚠️ Warning: This PLY file has a tilted coordinate system.\n\n' +
1213
+ 'This may cause the bounding box to appear tilted.\n\n' +
1214
+ 'Do you want to automatically align the PLY to world axes?\n\n' +
1215
+ '(Recommended: Yes)'
1216
+ );
1217
 
1218
+ if (shouldNormalize) {
1219
+ console.log('[preprocessManual] Step 3: Checking if rotation is needed...');
1220
+ console.log('[preprocessManual] Longest axis:',
1221
+ sizeX > sizeY && sizeX > sizeZ ? 'X' :
1222
+ sizeZ > sizeY ? 'Z' : 'Y');
1223
+
1224
+ let rotationNeeded = new THREE.Matrix4();
1225
+ let rotationApplied = false;
1226
 
1227
+ if (sizeX > sizeY && sizeX > sizeZ) {
1228
+ console.log('[preprocessManual] ⚙️ Rotating: X → Y (90° around Z axis)');
1229
+ rotationNeeded.makeRotationZ(Math.PI / 2);
1230
+ rotationApplied = true;
1231
+ } else if (sizeZ > sizeY && sizeZ > sizeX) {
1232
+ console.log('[preprocessManual] ⚙️ Rotating: Z → Y (90° around X axis)');
1233
+ rotationNeeded.makeRotationX(Math.PI / 2);
1234
+ rotationApplied = true;
1235
+ } else {
1236
+ console.log('[preprocessManual] ✓ Y-axis is already the longest, no rotation needed');
1237
+ }
1238
 
1239
+ if (rotationApplied) {
1240
+ console.log('[preprocessManual] Step 4: Applying rotation to all vertices...');
1241
+
1242
+ plyData.vertices.forEach(v => {
1243
+ const pos = new THREE.Vector3(v.x, v.y, v.z);
1244
+ pos.applyMatrix4(rotationNeeded);
1245
+ v.x = pos.x;
1246
+ v.y = pos.y;
1247
+ v.z = pos.z;
1248
+ });
1249
+
1250
+ console.log('[preprocessManual] ✓ PLY rotated to align with world axes');
1251
+
1252
+ window.plyAlignmentApplied = true;
1253
+ window.plyAlignmentMatrix = rotationNeeded.clone();
1254
+
1255
+ console.log('[preprocessManual] ✓ Alignment matrix saved for GS display');
1256
+ } else {
1257
+ console.log('[preprocessManual] Step 4: Skipped (no rotation needed)');
1258
+ }
1259
  } else {
1260
+ console.log('[preprocessManual] User chose to keep original orientation');
 
1261
  }
1262
+ } else {
1263
+ console.log('[preprocessManual] ✓ PLY coordinate system is already aligned');
1264
+ }
1265
+
1266
+ //////////////////// 10:32 end
1267
+
1268
  // ========================================
1269
  // STEP 4: 回転を適用(必要な場合のみ)
1270
  // ========================================