maxmustermann/armory
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/armory3d/armory

Browse source
This commit is contained in:
luboslenco 2019-12-19 16:24:58 +01:00
parent ea75669161 57cdce61b1
commit b39a5af8bd
3 changed files with 28 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Sources/armory/logicnode/LookAtNode.hx
View file

@ -5,6 +5,7 @@ import iron.math.Quat;
class LookAtNode extends LogicNode {
public var property0:String;
var v1 = new Vec4();
var v2 = new Vec4();
var q = new Quat();
@ -19,7 +20,20 @@ class LookAtNode extends LogicNode {
if (vfrom == null || vto == null) return null;
v1.set(0, 0, 1);
switch (property0) {
case "X":
v1.set(1, 0, 0);
case "-X":
v1.set(-1, 0, 0);
case "Y":
v1.set(0, 1, 0);
case "-Y":
v1.set(0, -1, 0);
case "Z":
v1.set(0, 0, 1);
case "-Z":
v1.set(0, 0, -1);
}
v2.setFrom(vto).sub(vfrom).normalize();
q.fromTo(v1, v2);

12
blender/arm/logicnode/value_look_at.py
View file

@ -9,9 +9,21 @@ class LookAtNode(Node, ArmLogicTreeNode):
bl_label = 'Look At'
bl_icon = 'QUESTION'
property0: EnumProperty(
items = [('X', ' X', 'X'),
('-X', '-X', '-X'),
('Y', ' Y', 'Y'),
('-Y', '-Y', '-Y'),
('Z', ' Z', 'Z'),
('-Z', '-Z', '-Z')],
name='With', default='Z')
def init(self, context):
self.inputs.new('NodeSocketVector', 'From Location')
self.inputs.new('NodeSocketVector', 'To Location')
self.outputs.new('NodeSocketVector', 'Rotation')
def draw_buttons(self, context, layout):
layout.prop(self, 'property0')
add_node(LookAtNode, category='Value')

2
blender/arm/material/cycles.py
View file

@ -90,7 +90,7 @@ def parse_output(node, _con, _vert, _frag, _geom, _tesc, _tese, _parse_surface,
if '_Emission' in wrd.world_defs:
frag.write('emission = {0};'.format(out_emission))
if parse_opacity:
frag.write('opacity = {0};'.format(out_opacity))
frag.write('opacity = {0} - 0.0002;'.format(out_opacity))
# Volume
# parse_volume_input(node.inputs[1])