merge from upstream

Seth Alves committed 10 years ago

Commit f013f952 parents 0b1fa4f eecb5b9361 files · +14555 −4248Browse files

Showing the changes to libraries/script-engine/src/SceneScriptingInterface.h (1 of 361 files). Show all

Unified · Split

libraries/script-engine/src/SceneScriptingInterface.h+5−5

@@ -107,9 +107,9 @@ public: · 106 unmodified lines
107	Q_INVOKABLE void setEngineMaxDrawnOverlay3DItems(int count) { _maxDrawnOverlay3DItems = count; }	107	Q_INVOKABLE void setEngineMaxDrawnOverlay3DItems(int count) { _maxDrawnOverlay3DItems = count; }
108	Q_INVOKABLE int getEngineMaxDrawnOverlay3DItems() { return _maxDrawnOverlay3DItems; }	108	Q_INVOKABLE int getEngineMaxDrawnOverlay3DItems() { return _maxDrawnOverlay3DItems; }
109		109
110	Q_INVOKABLE void setEngineDisplayItemStatus(uint32_t display) { _drawItemStatus = display; }	110	Q_INVOKABLE void setEngineDisplayItemStatus(int display) { _drawItemStatus = display; }
111	Q_INVOKABLE uint32_t doEngineDisplayItemStatus() { return _drawItemStatus; }	111	Q_INVOKABLE int doEngineDisplayItemStatus() { return _drawItemStatus; }
112		112
113	Q_INVOKABLE void setEngineDisplayHitEffect(bool display) { _drawHitEffect = display; }	113	Q_INVOKABLE void setEngineDisplayHitEffect(bool display) { _drawHitEffect = display; }
114	Q_INVOKABLE bool doEngineDisplayHitEffect() { return _drawHitEffect; }	114	Q_INVOKABLE bool doEngineDisplayHitEffect() { return _drawHitEffect; }
115		115
@@ -143,8 +143,8 @@ protected: · 27 unmodified lines
143	int _maxDrawnTransparentItems = -1;	143	int _maxDrawnTransparentItems = -1;
144	int _maxDrawnOverlay3DItems = -1;	144	int _maxDrawnOverlay3DItems = -1;
145		145
146	uint32_t _drawItemStatus = false;	146	int _drawItemStatus = 0;
147		147
148	bool _drawHitEffect = false;	148	bool _drawHitEffect = false;
149		149
150	};	150	};