Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-04-08 17:44:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix materialcachescriptinginterface

Browse source
This commit is contained in:
HifiExperiments 2019-10-25 18:16:08 -07:00
parent 1e100a672e
commit deb5aacfad
3 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/Application.cpp
View file

@ -106,7 +106,7 @@
#include <MessagesClient.h>
#include <hfm/ModelFormatRegistry.h>
#include <model-networking/ModelCacheScriptingInterface.h>
#include <material-networking/MaterialCacheScriptingInterface.h>
#include <procedural/MaterialCacheScriptingInterface.h>
#include <material-networking/TextureCacheScriptingInterface.h>
#include <ModelEntityItem.h>
#include <NetworkAccessManager.h>

1
libraries/material-networking/src/material-networking/MaterialCacheScriptingInterface.cpp → libraries/procedural/src/procedural/MaterialCacheScriptingInterface.cpp
View file

@ -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.

13
libraries/material-networking/src/material-networking/MaterialCacheScriptingInterface.h → libraries/procedural/src/procedural/MaterialCacheScriptingInterface.h
View file

@ -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 <QObject>
#include <ResourceCache.h>
#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 <code>TextureCache</code> 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