Browse Source

L3D: Allow changing layer transparency

trethaller 7 years ago
parent
commit
b84862edba
3 changed files with 4 additions and 4 deletions
  1. 1 1
      hide/prefab/Box.hx
  2. 1 1
      hide/prefab/l3d/Layer.hx
  3. 2 2
      hide/view/l3d/Level3D.hx

+ 1 - 1
hide/prefab/Box.hx

@@ -6,7 +6,7 @@ class Box extends Object3D {
 	
 	public function setColor(col: Int) {
 		if(mesh != null) {
-			mesh.material.color.setColor(col | (80 << 24));
+			mesh.material.color.setColor(col);
 		}
 	}
 

+ 1 - 1
hide/prefab/l3d/Layer.hx

@@ -56,7 +56,7 @@ class Layer extends Object3D {
 			ctx.onChange(this, pname);
 		});
 		var colorInput = props.find('input[name="colorVal"]');
-		var picker = new hide.comp.ColorPicker(false,null,colorInput);
+		var picker = new hide.comp.ColorPicker(true,null,colorInput);
 		picker.value = color;
 		picker.onChange = function(move) {
 			if(!move) {

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

@@ -464,7 +464,7 @@ class Level3D extends FileView {
 	function updateTreeStyle(p: PrefabElement, el: Element) {
 		var layer = p.to(hide.prefab.l3d.Layer);
 		if(layer != null) {
-			var color = "#" + StringTools.hex(layer.color, 6);
+			var color = "#" + StringTools.hex(layer.color & 0xffffff, 6);
 			el.find("i.jstree-themeicon").first().css("color", color);
 			if(layer.locked)
 				el.find("a").first().addClass("jstree-locked");
@@ -515,7 +515,7 @@ class Level3D extends FileView {
 	}
 
 	static function getDisplayColor(p: PrefabElement) {
-		var color = 0xffffff;
+		var color = 0x80ffffff;
 		var layer = p.getParent(Layer);
 		if(layer != null) {
 			color = layer.color;