fly/fgdata
1
0
Fork 0
Code Activity

Merge branch 'master' of gitorious.org:fg/fgdata

Browse source
This commit is contained in:
BARANGER Emmanuel 2014-01-20 00:51:03 +01:00
commit 07f170ff1e
2 changed files with 29 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Nasal/material.nas
View file

@ -51,7 +51,7 @@
var dialog = nil;
var colorgroup = func(parent, name, base) {
var undef = func { props.globals.getNode(base ~ name ~ "/" ~ parent) == nil };
var undef = func(color) { props.globals.getNode(base ~ name ~ "/" ~ color) == nil };
if (undef("red") and undef("green") and undef("blue")) {
return 0;

50
mice.xml
View file

@ -41,6 +41,34 @@ current mode for each mouse is held in the
<reason>right-click</reason>
</binding>
</button>
<!-- extra buttons control FoV -->
<!-- these are often assigned to mouse-wheel motion in Linux -->
<button n="3">
<binding>
<condition>
<and>
<property>/devices/status/mice/mouse[0]/button[2]</property>
<not><property>/sim/mouse/right-button-mode-cycle-enabled</property></not>
</and>
</condition>
<command>nasal</command>
<script>view.decrease()</script>
</binding>
</button>
<button n="4">
<binding>
<condition>
<and>
<property>/devices/status/mice/mouse[0]/button[2]</property>
<not><property>/sim/mouse/right-button-mode-cycle-enabled</property></not>
</and>
</condition>
<command>nasal</command>
<script>view.increase()</script>
</binding>
</button>
</mode>
@ -309,28 +337,6 @@ current mode for each mouse is held in the
<constrained type="bool">true</constrained>
<pass-through type="bool">false</pass-through>
<!-- extra buttons control FoV -->
<!-- these are often assigned to mouse-wheel motion in Linux -->
<button n="3">
<binding>
<condition>
<property>/devices/status/mice/mouse[0]/button[2]</property>
</condition>
<command>nasal</command>
<script>view.decrease()</script>
</binding>
</button>
<button n="4">
<binding>
<condition>
<property>/devices/status/mice/mouse[0]/button[2]</property>
</condition>
<command>nasal</command>
<script>view.increase()</script>
</binding>
</button>
<!-- Mouse left/right motion -->
<x-axis>