device: a few InputDevice API tweaks

rdb · rdb · commit 29170278e97c · 2018-11-30T20:54:35.000+01:00
find_button() and find_axis() should not error since there is no way to find out whether a button/axis exists or not
diff --git a/panda/src/device/inputDevice.I b/panda/src/device/inputDevice.I
@@ -250,13 +250,8 @@ is_button_known(size_t index) const {
  */
 INLINE InputDevice::ButtonState InputDevice::
 get_button(size_t index) const {
-  if (index < _buttons.size()) {
-    return _buttons[index];
-  } else {
-    device_cat.error()
-      << "Index " << index << " was not found in the axes list\n";
-    return ButtonState();
-  }
+  nassertr_always(index < _buttons.size(), ButtonState());
+  return _buttons[index];
 }
 
 /**
@@ -270,8 +265,6 @@ find_button(ButtonHandle handle) const {
       return _buttons[i];
     }
   }
-  device_cat.error()
-    << "Handle " << handle.get_name() << " was not found in the axes list\n";
   return ButtonState();
 }
 
@@ -321,13 +314,8 @@ get_axis_value(size_t index) const {
  */
 INLINE InputDevice::AxisState InputDevice::
 get_axis(size_t index) const {
-  if (index < _axes.size()) {
-    return _axes[index];
-  } else {
-    device_cat.error()
-      << "Index " << index << " was not found in the axes list\n";
-    return AxisState();
-  }
+  nassertr_always(index < _axes.size(), AxisState());
+  return _axes[index];
 }
 
 /**
@@ -341,8 +329,6 @@ find_axis(InputDevice::Axis axis) const {
       return _axes[i];
     }
   }
-  device_cat.error()
-    << "Axis " << axis << " was not found in the axes list\n";
   return AxisState();
 }
 
diff --git a/panda/src/device/inputDevice.h b/panda/src/device/inputDevice.h
@@ -142,6 +142,8 @@ class EXPCL_PANDA_DEVICE InputDevice : public TypedReferenceCount {
     ALWAYS_INLINE bool is_pressed() const;
 
   PUBLISHED:
+    operator bool() { return _state != S_unknown; }
+
     MAKE_PROPERTY(known, is_known);
     MAKE_PROPERTY(pressed, is_pressed);
 
@@ -156,6 +158,8 @@ class EXPCL_PANDA_DEVICE InputDevice : public TypedReferenceCount {
     constexpr AxisState() = default;
 
   PUBLISHED:
+    operator bool() { return known && value != 0.0; }
+
     Axis axis = Axis::none;
     double value = 0.0;
     bool known = false;
@@ -268,6 +272,8 @@ class EXPCL_PANDA_DEVICE InputDevice : public TypedReferenceCount {
   PT(PointerEventList) get_pointer_events();
 
   virtual void output(std::ostream &out) const;
+
+public:
   static std::string format_device_class(DeviceClass dc);
   static std::string format_axis(Axis axis);
 

Original file line number	Diff line number	Diff line change
`@@ -250,13 +250,8 @@ is_button_known(size_t index) const {`
`250`	`250`	`*/`
`251`	`251`	`INLINE InputDevice::ButtonState InputDevice::`
`252`	`252`	`get_button(size_t index) const {`
`253`		`- if (index < _buttons.size()) {`
`254`		`- return _buttons[index];`
`255`		`- } else {`
`256`		`- device_cat.error()`
`257`		`- << "Index " << index << " was not found in the axes list\n";`
`258`		`- return ButtonState();`
`259`		`- }`
	`253`	`+ nassertr_always(index < _buttons.size(), ButtonState());`
	`254`	`+ return _buttons[index];`
`260`	`255`	`}`
`261`	`256`
`262`	`257`	`/**`
`@@ -270,8 +265,6 @@ find_button(ButtonHandle handle) const {`
`270`	`265`	`return _buttons[i];`
`271`	`266`	`}`
`272`	`267`	`}`
`273`		`- device_cat.error()`
`274`		`- << "Handle " << handle.get_name() << " was not found in the axes list\n";`
`275`	`268`	`return ButtonState();`
`276`	`269`	`}`
`277`	`270`
`@@ -321,13 +314,8 @@ get_axis_value(size_t index) const {`
`321`	`314`	`*/`
`322`	`315`	`INLINE InputDevice::AxisState InputDevice::`
`323`	`316`	`get_axis(size_t index) const {`
`324`		`- if (index < _axes.size()) {`
`325`		`- return _axes[index];`
`326`		`- } else {`
`327`		`- device_cat.error()`
`328`		`- << "Index " << index << " was not found in the axes list\n";`
`329`		`- return AxisState();`
`330`		`- }`
	`317`	`+ nassertr_always(index < _axes.size(), AxisState());`
	`318`	`+ return _axes[index];`
`331`	`319`	`}`
`332`	`320`
`333`	`321`	`/**`
`@@ -341,8 +329,6 @@ find_axis(InputDevice::Axis axis) const {`
`341`	`329`	`return _axes[i];`
`342`	`330`	`}`
`343`	`331`	`}`
`344`		`- device_cat.error()`
`345`		`- << "Axis " << axis << " was not found in the axes list\n";`
`346`	`332`	`return AxisState();`
`347`	`333`	`}`
`348`	`334`