common/Charts/3DTransformation to function-closure

build/configs/webexcel.json

@@ -27,6 +27,7 @@
         "../common/Charts/charts.js",
 		"../common/Charts/DrawingArea.js",
 		"../common/Charts/DrawingObjects.js",
+		"../common/Charts/3DTransformation.js",
 		"../common/Charts/ChartsDrawer.js",
 		
 		"../common/scroll.js",
@@ -35,7 +36,6 @@
         "../common/wordcopypaste.js",
 
         "../cell/apiDefines.js",
-        "../common/Charts/3DTransformation.js",
         "../common/FontsFreeType/font_engine.js",
         "../common/FontsFreeType/FontFile.js",
         "../common/FontsFreeType/FontManager.js",

build/configs/webpowerpoint.json

@@ -27,6 +27,7 @@
         "../common/Charts/charts.js",
 		"../common/Charts/DrawingArea.js",
 		"../common/Charts/DrawingObjects.js",
+		"../common/Charts/3DTransformation.js",
 		"../common/Charts/ChartsDrawer.js",
 		
 		"../common/scroll.js",
@@ -43,7 +44,6 @@
         "../slide/Drawing/ThemeLoader.js",
         "../common/SerializeCommonWordExcel.js",
         "../common/SerializeChart.js",
-        "../common/Charts/3DTransformation.js",
         "../word/Editor/Serialize2.js",
         "../word/Editor/Styles.js",
         "../word/Editor/Numbering.js",

build/configs/webword.json

@@ -30,6 +30,7 @@
         "../common/Charts/charts.js",
 		"../common/Charts/DrawingArea.js",
 		"../common/Charts/DrawingObjects.js",
+		"../common/Charts/3DTransformation.js",
 		"../common/Charts/ChartsDrawer.js",
 		
 		"../common/scroll.js",
@@ -49,7 +50,6 @@
         "../word/Drawing/Externals.js",
         "../common/GlobalLoaders.js",
         "../word/Drawing/translations.js",
-        "../common/Charts/3DTransformation.js",
         "../common/Drawings/TrackObjects/AdjustmentTracks.js",
         "../common/Drawings/TrackObjects/MoveTracks.js",
         "../common/Drawings/TrackObjects/NewShapeTracks.js",

common/Charts/3DTransformation.js

 "use strict";
 
+(
+/**
+* @param {Window} window
+* @param {undefined} undefined
+*/
+function (window, undefined) {
+
 // Import
 var ORIENTATION_MIN_MAX = AscFormat.ORIENTATION_MIN_MAX;
 
@@ -2341,3 +2348,9 @@ Point3D.prototype =
 		return C;
 	}
 };
+
+	//----------------------------------------------------------export----------------------------------------------------
+	window['AscFormat'] = window['AscFormat'] || {};
+	window['AscFormat'].Processor3D = Processor3D;
+	window['AscFormat'].Point3D = Point3D;
+})(window);

common/Charts/ChartsDrawer.js

@@ -11,6 +11,7 @@ function (window, undefined) {
 var cToDeg = AscFormat.cToDeg;
 var Path = AscFormat.Path;
 var ORIENTATION_MIN_MAX = AscFormat.ORIENTATION_MIN_MAX;
+var Point3D = AscFormat.Point3D;
 
 var c_oAscTickMark = Asc.c_oAscTickMark;
 var c_oAscChartDataLabelsPos = Asc.c_oAscChartDataLabelsPos;
@@ -2118,7 +2119,7 @@ CChartsDrawer.prototype =
 		standartMarginForCharts = 17;
 		
 		
-		this.processor3D = new Processor3D(widthCanvas, heightCanvas, left, right, bottom, top, chartSpace, this);
+		this.processor3D = new AscFormat.Processor3D(widthCanvas, heightCanvas, left, right, bottom, top, chartSpace, this);
 		this.processor3D.calaculate3DProperties();
 		this.processor3D.correctPointsPosition(chartSpace);
 	},
@@ -11074,7 +11075,7 @@ TEST3D2.prototype =
 
 
 			// ToDo а нужна ли global3DPersperctive в ChartsDrawer ?
-		var perspective = this.cChartSpace.chart.view3D && this.cChartSpace.chart.view3D.perspective ? this.cChartSpace.chart.view3D.perspective : global3DPersperctive;
+		var perspective = this.cChartSpace.chart.view3D && this.cChartSpace.chart.view3D.perspective ? this.cChartSpace.chart.view3D.perspective : AscFormat.global3DPersperctive;
 		var alpha = perspective / 2;
 		
 		var halfHeight  = heightChart / 2;
@@ -11475,6 +11476,7 @@ TEST3D.prototype =
     }
 };
 
+	//----------------------------------------------------------export----------------------------------------------------
 	window['AscFormat'] = window['AscFormat'] || {};
 	window['AscFormat'].CChartsDrawer = CChartsDrawer;
 })(window);