Просмотр исходного кода

Rename l3d props to sceneeditor

Leonardo Jeanteur 4 лет назад
Родитель
Сommit
e939013551
3 измененных файлов с 14 добавлено и 18 удалено
  1. 7 11
      bin/defaultProps.json
  2. 1 1
      hide/comp/cdb/DataFiles.hx
  3. 6 6
      hide/view/l3d/Level3D.hx

+ 7 - 11
bin/defaultProps.json

@@ -134,18 +134,14 @@
 	"sceneeditor.sceneSpeed" : {"title" : "Speed", "type" : "Range"},
 
 	// l3d config
-	"l3d.groundLayer": "ground",
-	"l3d.cdbLevel": "level",
-	"l3d.colors": {
+	"sceneeditor.cdbLevel": "level",
+	"sceneeditor.colors": {
 	},
-	"l3d.treeStyles": {
-		"settings": {"color": "#ffffff", "font-weight": "bold"}
-	},
-	"l3d.filterTypes": ["terrain", "model", "polygon", "box", "instance", "light"],
-	"l3d.tags": [ { "id": "tag", "color": "#802000" } ],
-	"l3d.camera.moveSpeed": 1.5,
-	"l3d.gridSize": 100,
-	"l3d.gridStep": 1,
+	"sceneeditor.filterTypes": ["terrain", "model", "polygon", "box", "instance", "light"],
+	"sceneeditor.tags": [ { "id": "tag", "color": "#802000" } ],
+	"sceneeditor.camera.moveSpeed": 1.5,
+	"sceneeditor.gridSize": 100,
+	"sceneeditor.gridStep": 1,
 
 	// FX editor
 	"fx.shaders": [

+ 1 - 1
hide/comp/cdb/DataFiles.hx

@@ -214,7 +214,7 @@ class DataFiles {
 	public static function getAvailableTypes() {
 		var sheets = [];
 		var ide = Ide.inst;
-		var levelSheet = ide.database.getSheet(ide.currentConfig.get("l3d.cdbLevel", "level"));
+		var levelSheet = ide.database.getSheet(ide.currentConfig.get("sceneeditor.cdbLevel", "level"));
 		for( s in ide.database.sheets )
 			if( s.props.dataFiles != null )
 				sheets.push(s);

+ 6 - 6
hide/view/l3d/Level3D.hx

@@ -114,7 +114,7 @@ class CamController extends h3d.scene.CameraController {
 			mov.x * Math.cos(theta) + mov.y * Math.cos(Math.PI / 2 + theta),
 			mov.x * Math.sin(theta) + mov.y * Math.sin(Math.PI / 2 + theta)
 		);
-		var moveSpeed = Ide.inst.currentConfig.get("l3d.camera.moveSpeed", 1.5);
+		var moveSpeed = Ide.inst.currentConfig.get("sceneeditor.camera.moveSpeed", 1.5);
 
 		var delta = dir.multiply(0.01 * moveSpeed * (distance + scene.camera.zNear));
 		delta.w = 0;
@@ -252,7 +252,7 @@ private class PrefabSceneEditor extends hide.comp.SceneEditor {
 	}
 
 	override function getAvailableTags(p:PrefabElement) {
-		return cast ide.currentConfig.get("l3d.tags");
+		return cast ide.currentConfig.get("sceneeditor.tags");
 	}
 }
 
@@ -628,8 +628,8 @@ class Level3D extends FileView {
 		grid = new h3d.scene.Graphics(scene.s3d);
 		grid.scale(1);
 		grid.material.mainPass.setPassName("debuggeom");
-		gridStep = ide.currentConfig.get("l3d.gridStep");
-		gridSize = ide.currentConfig.get("l3d.gridSize");
+		gridStep = ide.currentConfig.get("sceneeditor.gridStep");
+		gridSize = ide.currentConfig.get("sceneeditor.gridSize");
 
 		var col = h3d.Vector.fromColor(scene.engine.backgroundColor);
 		var hsl = col.toColorHSL();
@@ -701,7 +701,7 @@ class Level3D extends FileView {
 	}
 
 	function refreshSceneFilters() {
-		var filters : Array<String> = ide.currentConfig.get("l3d.filterTypes");
+		var filters : Array<String> = ide.currentConfig.get("sceneeditor.filterTypes");
 		filters = filters.copy();
 		for(sheet in DataFiles.getAvailableTypes()) {
 			filters.push(DataFiles.getTypeName(sheet));
@@ -802,7 +802,7 @@ class Level3D extends FileView {
 	function getDisplayColor(p: PrefabElement) : Null<Int> {
 		var typeId = p.getCdbType();
 		if(typeId != null) {
-			var colors = ide.currentConfig.get("l3d.colors");
+			var colors = ide.currentConfig.get("sceneeditor.colors");
 			var color = Reflect.field(colors, typeId);
 			if(color != null) {
 				return Std.parseInt("0x"+color.substr(1)) | 0xff000000;