From deb5aacfad61026b6e464c6e5be69ad809c8eb03 Mon Sep 17 00:00:00 2001 From: HifiExperiments Date: Fri, 25 Oct 2019 18:16:08 -0700 Subject: [PATCH] fix materialcachescriptinginterface --- interface/src/Application.cpp | 2 +- .../procedural}/MaterialCacheScriptingInterface.cpp | 1 - .../procedural}/MaterialCacheScriptingInterface.h | 13 ++++++------- 3 files changed, 7 insertions(+), 9 deletions(-) rename libraries/{material-networking/src/material-networking => procedural/src/procedural}/MaterialCacheScriptingInterface.cpp (90%) rename libraries/{material-networking/src/material-networking => procedural/src/procedural}/MaterialCacheScriptingInterface.h (81%) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 9f76a1f034..ab5c3fb350 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -106,7 +106,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/libraries/material-networking/src/material-networking/MaterialCacheScriptingInterface.cpp b/libraries/procedural/src/procedural/MaterialCacheScriptingInterface.cpp similarity index 90% rename from libraries/material-networking/src/material-networking/MaterialCacheScriptingInterface.cpp rename to libraries/procedural/src/procedural/MaterialCacheScriptingInterface.cpp index 193d9b96ee..77eceaa10b 100644 --- a/libraries/material-networking/src/material-networking/MaterialCacheScriptingInterface.cpp +++ b/libraries/procedural/src/procedural/MaterialCacheScriptingInterface.cpp @@ -1,6 +1,5 @@ // // MaterialCacheScriptingInterface.cpp -// libraries/mmodel-networking/src/model-networking // // Created by Sam Gateau on 17 September 2019. // Copyright 2019 High Fidelity, Inc. diff --git a/libraries/material-networking/src/material-networking/MaterialCacheScriptingInterface.h b/libraries/procedural/src/procedural/MaterialCacheScriptingInterface.h similarity index 81% rename from libraries/material-networking/src/material-networking/MaterialCacheScriptingInterface.h rename to libraries/procedural/src/procedural/MaterialCacheScriptingInterface.h index c619966a2a..3a13652aec 100644 --- a/libraries/material-networking/src/material-networking/MaterialCacheScriptingInterface.h +++ b/libraries/procedural/src/procedural/MaterialCacheScriptingInterface.h @@ -1,6 +1,5 @@ // -// MaterialCacheScriptingInterface.h -// libraries/material-networking/src/material-networking +// ProceduralMaterialCacheScriptingInterface.h // // Created by Sam Gateau on 17 September 2019. // Copyright 2019 High Fidelity, Inc. @@ -10,14 +9,14 @@ // #pragma once -#ifndef hifi_MaterialCacheScriptingInterface_h -#define hifi_MaterialCacheScriptingInterface_h +#ifndef hifi_ProceduralMaterialCacheScriptingInterface_h +#define hifi_ProceduralMaterialCacheScriptingInterface_h #include #include -#include "MaterialCache.h" +#include "ProceduralMaterialCache.h" class MaterialCacheScriptingInterface : public ScriptableResourceCache, public Dependency { Q_OBJECT @@ -27,7 +26,7 @@ class MaterialCacheScriptingInterface : public ScriptableResourceCache, public D /**jsdoc * The TextureCache API manages texture cache resources. * - * @namespace TextureCache + * @namespace MaterialCache * * @hifi-interface * @hifi-client-entity @@ -48,4 +47,4 @@ public: MaterialCacheScriptingInterface(); }; -#endif // hifi_MaterialCacheScriptingInterface_h +#endif // hifi_ProceduralMaterialCacheScriptingInterface_h