Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-16 09:29:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove unused headers

Browse source
This commit is contained in:
Atlante45 2016-01-08 18:04:02 -08:00
parent 11dc3cd261
commit 205c14eb43
9 changed files with 3 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
interface/src/ui/overlays/ImageOverlay.cpp
View file

@ -13,7 +13,6 @@
#include <DependencyManager.h>
#include <GeometryCache.h>
#include <gpu/Context.h>
#include <gpu/StandardShaderLib.h>
#include <RegisteredMetaTypes.h>

4
interface/src/ui/overlays/Overlay.cpp
View file

@ -222,10 +222,8 @@ float Overlay::updatePulse() {
}
bool Overlay::addToScene(Overlay::Pointer overlay, std::shared_ptr<render::Scene> scene, render::PendingChanges& pendingChanges) {
auto overlayPayload = new Overlay::Payload(overlay);
auto overlayPayloadPointer = Overlay::PayloadPointer(overlayPayload);
_renderItemID = scene->allocateID();
pendingChanges.resetItem(_renderItemID, overlayPayloadPointer);
pendingChanges.resetItem(_renderItemID, std::make_shared<Overlay::Payload>(overlay));
return true;
}

2
libraries/model-networking/src/model-networking/ModelCache.cpp
View file

@ -22,8 +22,6 @@
#include "TextureCache.h"
#include "ModelNetworkingLogging.h"
#include "gpu/StandardShaderLib.h"
#include "model/TextureMap.h"
//#define WANT_DEBUG

3
libraries/model-networking/src/model-networking/ModelCache.h
View file

@ -48,9 +48,6 @@ public:
/// \param delayLoad if true, don't load the geometry immediately; wait until load is first requested
QSharedPointer<NetworkGeometry> getGeometry(const QUrl& url, const QUrl& fallback = QUrl(), bool delayLoad = false);
/// Set a batch to the simple pipeline, returning the previous pipeline
void useSimpleDrawPipeline(gpu::Batch& batch, bool noBlend = false);
private:
ModelCache();
virtual ~ModelCache();

1
libraries/render-utils/src/AmbientOcclusionEffect.cpp
View file

@ -16,7 +16,6 @@
#include <SharedUtil.h>
#include <gpu/Context.h>
#include "gpu/StandardShaderLib.h"
#include "AmbientOcclusionEffect.h"
#include "TextureCache.h"
#include "FramebufferCache.h"

1
libraries/render-utils/src/AntialiasingEffect.cpp
View file

@ -16,7 +16,6 @@
#include <SharedUtil.h>
#include <gpu/Context.h>
#include "gpu/StandardShaderLib.h"
#include "AntialiasingEffect.h"
#include "TextureCache.h"
#include "FramebufferCache.h"

1
libraries/render-utils/src/DeferredLightingEffect.cpp
View file

@ -17,7 +17,6 @@
#include <gpu/Batch.h>
#include <gpu/Context.h>
#include <gpu/StandardShaderLib.h>
#include "AbstractViewStateInterface.h"
#include "GeometryCache.h"

5
libraries/render-utils/src/GeometryCache.cpp
View file

@ -1841,9 +1841,8 @@ void renderInstances(const std::string& name, gpu::Batch& batch, const Transform
instanceColorBuffer->append(compactColor);
}
auto that = DependencyManager::get<GeometryCache>();
batch.setupNamedCalls(name, [=](gpu::Batch& batch, gpu::Batch::NamedBatchData& data) {
auto pipeline = that->bindSimpleProgram(batch);
batch.setupNamedCalls(name, [f](gpu::Batch& batch, gpu::Batch::NamedBatchData& data) {
auto pipeline = DependencyManager::get<GeometryCache>()->bindSimpleProgram(batch);
auto location = pipeline->getProgram()->getUniforms().findLocation("Instanced");
batch._glUniform1i(location, 1);

1
tests/gpu-test/src/main.cpp
View file

@ -30,7 +30,6 @@
#include <gpu/Context.h>
#include <gpu/Batch.h>
#include <gpu/Stream.h>
#include <gpu/StandardShaderLib.h>
#include <gpu/GLBackend.h>
#include <gl/QOpenGLContextWrapper.h>