xushiting пре 2 година
родитељ
комит
bb3e6ce7d5
7 измењених фајлова са 5710 додато и 3396 уклоњено
  1. 2 1
      src/Potree.js
  2. 4 4
      src/custom/note.txt
  3. 1 1
      src/custom/potree.shim.js
  4. 5181 0
      src/custom/viewer.js
  5. 7 22
      src/loader/PointAttributes.js
  6. 15 5
      src/viewer/SaveProject.js
  7. 500 3363
      src/viewer/viewer.js

+ 2 - 1
src/Potree.js

@@ -76,7 +76,8 @@ export * from "./utils/TransformationTool.js";
 export * from "./utils/Volume.js";
 export * from "./utils/VolumeTool.js";
 export * from "./utils/Compass.js";
-export * from "./viewer/viewer.js";
+//export * from "./viewer/viewer.js";
+													export * from "./custom/viewer.js";
 export * from "./viewer/Scene.js";
 export * from "./viewer/HierarchicalSlider.js";
 

+ 4 - 4
src/custom/note.txt

@@ -25,7 +25,7 @@ src/exporter/GeoJSONExporter.js	复原了
 src/loader/BinaryLoader.js		复原了
 src/loader/GeoPackageLoader.js	复原了
 src/loader/POCLoader.js			先缓缓
-src/loader/PointAttribute.js		先缓缓,复原后出错,很奇怪
+src/loader/PointAttribute.js		复原了
 src/loader/ShapefileLoader.js	复原了
 src/materials/EyeDomeLightingMaterial.js		先缓缓
 src/materials/PointCloudMaterial.js			先缓缓
@@ -56,14 +56,14 @@ src/viewer/HQSplatRenderer.js							先缓缓
 src/viewer/LoadProject.js								先缓缓
 src/viewer/map.js										先缓缓
 src/viewer/potree.css									先缓缓,到时候找赖志彬修改
-src/viewer/PotreeRenderer.js								复原了,发现没用到
+src/viewer/PotreeRenderer.js							复原了,发现没用到
 src/viewer/profile.js									复原了
-src/viewer/SaveProject.js								先缓缓
+src/viewer/SaveProject.js								复原了,发现没用到
 src/viewer/Scene.js										先缓缓
 src/viewer/sidebar.html									先缓缓
 src/viewer/sidebar.js									先缓缓
 src/viewer/View.js										先缓缓
-src/viewer/viewer.js										先缓缓
+src/viewer/viewer.js									复原了,移植到custom文件夹里
 src/viewer/PropertyPanels/AreaPanel.js					先缓缓
 src/viewer/PropertyPanels/CameraAnimationPanel.js		先缓缓
 src/viewer/PropertyPanels/DistancePanel.js				先缓缓

+ 1 - 1
src/custom/potree.shim.js

@@ -522,7 +522,7 @@ BinaryLoader.prototype.load = function(node){
 }
 
 PointAttribute.RGBA_PACKED = new PointAttribute("rgba", PointAttributeTypes.DATA_TYPE_INT8, 4);
-
+PointAttribute.COLOR_PACKED = PointAttribute.RGBA_PACKED;
 PointAttribute.INTENSITY = new PointAttribute("intensity", PointAttributeTypes.DATA_TYPE_UINT16, 1);
 
 PointAttribute.CLASSIFICATION = new PointAttribute("classification", PointAttributeTypes.DATA_TYPE_UINT8, 1);

Разлика између датотеке није приказан због своје велике величине
+ 5181 - 0
src/custom/viewer.js


+ 7 - 22
src/loader/PointAttributes.js

@@ -1,9 +1,10 @@
+
 /**
  * Some types of possible point attribute data formats
  *
  * @class
  */
- const PointAttributeTypes = {
+const PointAttributeTypes = {
 	DATA_TYPE_DOUBLE: {ordinal: 0, name: "double", size: 8},
 	DATA_TYPE_FLOAT:  {ordinal: 1, name: "float",  size: 4},
 	DATA_TYPE_INT8:   {ordinal: 2, name: "int8",   size: 1},
@@ -37,28 +38,12 @@ class PointAttribute{
 	}
 
 };
-//add
-const replacements = {
-    "COLOR_PACKED": "rgba",
-    "RGBA": "rgba",
-    "INTENSITY": "intensity",
-    "CLASSIFICATION": "classification",
-    "GPS_TIME": "gps-time",
-};
-const replaceOldNames = (old) => {
-    if(replacements[old]){
-        return replacements[old];
-    }else{
-        return old;
-    }
-};
-
 
 PointAttribute.POSITION_CARTESIAN = new PointAttribute(
 	"POSITION_CARTESIAN", PointAttributeTypes.DATA_TYPE_FLOAT, 3);
 
 PointAttribute.RGBA_PACKED = new PointAttribute(
-	replaceOldNames("COLOR_PACKED"), PointAttributeTypes.DATA_TYPE_INT8, 4);
+	"COLOR_PACKED", PointAttributeTypes.DATA_TYPE_INT8, 4);
 
 PointAttribute.COLOR_PACKED = PointAttribute.RGBA_PACKED;
 
@@ -69,10 +54,10 @@ PointAttribute.NORMAL_FLOATS = new PointAttribute(
 	"NORMAL_FLOATS", PointAttributeTypes.DATA_TYPE_FLOAT, 3);
 
 PointAttribute.INTENSITY = new PointAttribute(
-	replaceOldNames("INTENSITY"), PointAttributeTypes.DATA_TYPE_UINT16, 1);
+	"INTENSITY", PointAttributeTypes.DATA_TYPE_UINT16, 1);
 
 PointAttribute.CLASSIFICATION = new PointAttribute(
-	replaceOldNames("CLASSIFICATION"), PointAttributeTypes.DATA_TYPE_UINT8, 1);
+	"CLASSIFICATION", PointAttributeTypes.DATA_TYPE_UINT8, 1);
 
 PointAttribute.NORMAL_SPHEREMAPPED = new PointAttribute(
 	"NORMAL_SPHEREMAPPED", PointAttributeTypes.DATA_TYPE_UINT8, 2);
@@ -99,7 +84,7 @@ PointAttribute.SPACING = new PointAttribute(
 	"SPACING", PointAttributeTypes.DATA_TYPE_FLOAT, 1);
 
 PointAttribute.GPS_TIME = new PointAttribute(
-	replaceOldNames("GPS_TIME"), PointAttributeTypes.DATA_TYPE_DOUBLE, 1);
+	"GPS_TIME", PointAttributeTypes.DATA_TYPE_DOUBLE, 1);
 
 export {PointAttribute};
 
@@ -148,4 +133,4 @@ export class PointAttributes{
 		return false;
 	};
 
-}
+}

+ 15 - 5
src/viewer/SaveProject.js

@@ -101,15 +101,25 @@ function createCameraAnimationData(animation){
 }
 
 function createMeasurementData(measurement){
-    const data = {
+
+	const data = {
 		uuid: measurement.uuid,
 		name: measurement.name,
-        measureType:measurement.measureType, //add 
-		points: measurement.points.map(p => p.toArray()),
-		 
+		points: measurement.points.map(p => p.position.toArray()),
+		showDistances: measurement.showDistances,
+		showCoordinates: measurement.showCoordinates,
+		showArea: measurement.showArea,
+		closed: measurement.closed,
+		showAngles: measurement.showAngles,
+		showHeight: measurement.showHeight,
+		showCircle: measurement.showCircle,
+		showAzimuth: measurement.showAzimuth,
+		showEdges: measurement.showEdges,
+		color: measurement.color.toArray(),
 	};
+
 	return data;
-} 
+}
 
 function createOrientedImagesData(images){
 	const data = {

Разлика између датотеке није приказан због своје велике величине
+ 500 - 3363
src/viewer/viewer.js