|
@@ -1,4 +1,5 @@
|
|
package hide.view;
|
|
package hide.view;
|
|
|
|
+import hrt.prefab.Light;
|
|
using Lambda;
|
|
using Lambda;
|
|
|
|
|
|
import hide.Element;
|
|
import hide.Element;
|
|
@@ -108,8 +109,8 @@ private class FXSceneEditor extends hide.comp.SceneEditor {
|
|
// TODO: Move material presets to props.json
|
|
// TODO: Move material presets to props.json
|
|
p.props = {
|
|
p.props = {
|
|
PBR: {
|
|
PBR: {
|
|
- mode: "Overlay",
|
|
|
|
- blend: "None",
|
|
|
|
|
|
+ mode: "BeforeTonemapping",
|
|
|
|
+ blend: "Alpha",
|
|
shadows: false
|
|
shadows: false
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -1264,27 +1265,38 @@ class FXEditor extends FileView {
|
|
menuItems.push(trackItem("Visibility", [{name: "visibility", clamp: [0., 1.]}]));
|
|
menuItems.push(trackItem("Visibility", [{name: "visibility", clamp: [0., 1.]}]));
|
|
}
|
|
}
|
|
if(obj3dElt != null) {
|
|
if(obj3dElt != null) {
|
|
- var scaleTracks = groupedTracks("scale", xyzwTracks(3));
|
|
|
|
- scaleTracks.unshift(trackItem("Uniform", [{name: "scale"}]));
|
|
|
|
- menuItems.push({
|
|
|
|
- label: "Position",
|
|
|
|
- menu: groupedTracks("position", xyzwTracks(3)),
|
|
|
|
- });
|
|
|
|
- menuItems.push({
|
|
|
|
- label: "Rotation",
|
|
|
|
- menu: groupedTracks("rotation", xyzwTracks(3)),
|
|
|
|
- });
|
|
|
|
- menuItems.push({
|
|
|
|
- label: "Scale",
|
|
|
|
- menu: scaleTracks,
|
|
|
|
- });
|
|
|
|
- menuItems.push({
|
|
|
|
- label: "Color",
|
|
|
|
- menu: [
|
|
|
|
- trackItem("HSL", hslTracks(), "color"),
|
|
|
|
- trackItem("Alpha", alphaTrack(), "color")
|
|
|
|
- ]
|
|
|
|
- });
|
|
|
|
|
|
+ /*var light = Std.downcast(obj3dElt, Light);
|
|
|
|
+ if( light != null ) {
|
|
|
|
+ menuItems.push({ label: "Position", menu: groupedTracks("position", xyzwTracks(3)), });
|
|
|
|
+ menuItems.push({ label: "Rotation", menu: groupedTracks("rotation", xyzwTracks(3)), });
|
|
|
|
+ menuItems.push(trackItem("Color", hslTracks(), "color"));
|
|
|
|
+ menuItems.push(trackItem("Power", [{name: "power", clamp: [0., 10.]}]));
|
|
|
|
+ menuItems.push(trackItem("Size", [{name: "size", clamp: [0., 5.]}]));
|
|
|
|
+ menuItems.push(trackItem("Range", [{name: "visibility", clamp: [1., 20.]}]));
|
|
|
|
+ }
|
|
|
|
+ else {
|
|
|
|
+ var scaleTracks = groupedTracks("scale", xyzwTracks(3));
|
|
|
|
+ scaleTracks.unshift(trackItem("Uniform", [{name: "scale"}]));
|
|
|
|
+ menuItems.push({
|
|
|
|
+ label: "Position",
|
|
|
|
+ menu: groupedTracks("position", xyzwTracks(3)),
|
|
|
|
+ });
|
|
|
|
+ menuItems.push({
|
|
|
|
+ label: "Rotation",
|
|
|
|
+ menu: groupedTracks("rotation", xyzwTracks(3)),
|
|
|
|
+ });
|
|
|
|
+ menuItems.push({
|
|
|
|
+ label: "Scale",
|
|
|
|
+ menu: scaleTracks,
|
|
|
|
+ });
|
|
|
|
+ menuItems.push({
|
|
|
|
+ label: "Color",
|
|
|
|
+ menu: [
|
|
|
|
+ trackItem("HSL", hslTracks(), "color"),
|
|
|
|
+ trackItem("Alpha", alphaTrack(), "color")
|
|
|
|
+ ]
|
|
|
|
+ });
|
|
|
|
+ }*/
|
|
menuItems.push(trackItem("Visibility", [{name: "visibility", clamp: [0., 1.]}]));
|
|
menuItems.push(trackItem("Visibility", [{name: "visibility", clamp: [0., 1.]}]));
|
|
}
|
|
}
|
|
if(shaderElt != null && shaderElt.shaderDef != null) {
|
|
if(shaderElt != null && shaderElt.shaderDef != null) {
|