Update macro

This commit is contained in:
Atlante45 2014-12-17 15:26:47 -08:00
parent d9d0166bc9
commit ce7f72d2cd
12 changed files with 13 additions and 11 deletions

View file

@ -20,7 +20,7 @@
/// customized canvas that simply forwards requests/events to the singleton application /// customized canvas that simply forwards requests/events to the singleton application
class GLCanvas : public QGLWidget { class GLCanvas : public QGLWidget {
Q_OBJECT Q_OBJECT
SINGLETON_DEPENDENCY(GLCanvas) SINGLETON_DEPENDENCY(GLCanvas, false)
public: public:
bool isThrottleRendering() const; bool isThrottleRendering() const;

View file

@ -20,7 +20,7 @@
class DdeFaceTracker : public FaceTracker { class DdeFaceTracker : public FaceTracker {
Q_OBJECT Q_OBJECT
SINGLETON_DEPENDENCY(DdeFaceTracker) SINGLETON_DEPENDENCY(DdeFaceTracker, false)
public: public:
//initialization //initialization

View file

@ -26,7 +26,7 @@
/// Handles interaction with the Faceshift software, which provides head position/orientation and facial features. /// Handles interaction with the Faceshift software, which provides head position/orientation and facial features.
class Faceshift : public FaceTracker { class Faceshift : public FaceTracker {
Q_OBJECT Q_OBJECT
SINGLETON_DEPENDENCY(Faceshift) SINGLETON_DEPENDENCY(Faceshift, false)
public: public:
void init(); void init();

View file

@ -28,7 +28,7 @@ namespace VisageSDK {
/// Handles input from the Visage webcam feature tracking software. /// Handles input from the Visage webcam feature tracking software.
class Visage : public FaceTracker { class Visage : public FaceTracker {
Q_OBJECT Q_OBJECT
SINGLETON_DEPENDENCY(Visage) SINGLETON_DEPENDENCY(Visage, false)
public: public:
void init(); void init();

View file

@ -26,7 +26,7 @@ typedef QSharedPointer<Animation> AnimationPointer;
/// Scriptable interface for FBX animation loading. /// Scriptable interface for FBX animation loading.
class AnimationCache : public ResourceCache { class AnimationCache : public ResourceCache {
Q_OBJECT Q_OBJECT
SINGLETON_DEPENDENCY(AnimationCache) SINGLETON_DEPENDENCY(AnimationCache, false)
public: public:
Q_INVOKABLE AnimationPointer getAnimation(const QString& url) { return getAnimation(QUrl(url)); } Q_INVOKABLE AnimationPointer getAnimation(const QString& url) { return getAnimation(QUrl(url)); }

View file

@ -27,6 +27,8 @@
#include <QtNetwork/QHostAddress> #include <QtNetwork/QHostAddress>
#include <QtNetwork/QUdpSocket> #include <QtNetwork/QUdpSocket>
#include <DependencyManager.h>
#include "DomainHandler.h" #include "DomainHandler.h"
#include "LimitedNodeList.h" #include "LimitedNodeList.h"
#include "Node.h" #include "Node.h"

View file

@ -21,7 +21,7 @@ class ProgramObject;
/// A screen space ambient occlusion effect. See John Chapman's tutorial at /// A screen space ambient occlusion effect. See John Chapman's tutorial at
/// http://john-chapman-graphics.blogspot.co.uk/2013/01/ssao-tutorial.html for reference. /// http://john-chapman-graphics.blogspot.co.uk/2013/01/ssao-tutorial.html for reference.
class AmbientOcclusionEffect { class AmbientOcclusionEffect {
SINGLETON_DEPENDENCY(AmbientOcclusionEffect) SINGLETON_DEPENDENCY(AmbientOcclusionEffect, false)
public: public:

View file

@ -24,7 +24,7 @@ class PostLightingRenderable;
/// Handles deferred lighting for the bits that require it (voxels, metavoxels...) /// Handles deferred lighting for the bits that require it (voxels, metavoxels...)
class DeferredLightingEffect { class DeferredLightingEffect {
SINGLETON_DEPENDENCY(DeferredLightingEffect) SINGLETON_DEPENDENCY(DeferredLightingEffect, false)
public: public:

View file

@ -34,7 +34,7 @@ class NetworkTexture;
/// Stores cached geometry. /// Stores cached geometry.
class GeometryCache : public ResourceCache { class GeometryCache : public ResourceCache {
Q_OBJECT Q_OBJECT
SINGLETON_DEPENDENCY(GeometryCache) SINGLETON_DEPENDENCY(GeometryCache, false)
public: public:
void renderHemisphere(int slices, int stacks); void renderHemisphere(int slices, int stacks);

View file

@ -27,7 +27,7 @@ class ProgramObject;
/// A generic full screen glow effect. /// A generic full screen glow effect.
class GlowEffect : public QObject { class GlowEffect : public QObject {
Q_OBJECT Q_OBJECT
SINGLETON_DEPENDENCY(GlowEffect) SINGLETON_DEPENDENCY(GlowEffect, false)
public: public:

View file

@ -470,7 +470,7 @@ Q_DECLARE_METATYPE(QVector<glm::vec3>)
/// Handle management of pending models that need blending /// Handle management of pending models that need blending
class ModelBlender : public QObject { class ModelBlender : public QObject {
Q_OBJECT Q_OBJECT
SINGLETON_DEPENDENCY(ModelBlender) SINGLETON_DEPENDENCY(ModelBlender, false)
public: public:

View file

@ -32,7 +32,7 @@ enum TextureType { DEFAULT_TEXTURE, NORMAL_TEXTURE, SPECULAR_TEXTURE, EMISSIVE_T
/// Stores cached textures, including render-to-texture targets. /// Stores cached textures, including render-to-texture targets.
class TextureCache : public ResourceCache { class TextureCache : public ResourceCache {
Q_OBJECT Q_OBJECT
SINGLETON_DEPENDENCY(TextureCache) SINGLETON_DEPENDENCY(TextureCache, false)
public: public: