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

Addressing review comments

Browse source
This commit is contained in:
Sam Gateau 2019-08-14 10:28:42 -07:00
parent 5c085bd08d
commit 859016bf37
6 changed files with 4 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libraries/gpu-gl/src/gpu/gl41/GL41BackendShader.cpp
View file

@ -56,9 +56,6 @@ void GL41Backend::postLinkProgram(ShaderObject& programObject, const Shader& pro
continue; continue;
} }
const auto& targetBinding = expectedResourceBuffers.at(resourceBuffer.name); const auto& targetBinding = expectedResourceBuffers.at(resourceBuffer.name);
if (resourceBuffer.name == std::string("polylineVerticesBuffer")) {
qDebug() << "Setting texture unit for " << resourceBuffer.name.c_str() << " to " << targetBinding;
}
glProgramUniform1i(glprogram, resourceBuffer.binding, targetBinding); glProgramUniform1i(glprogram, resourceBuffer.binding, targetBinding);
} }
} }

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

@ -52,7 +52,6 @@ void PreparePrimaryFramebufferMSAAConfig::setResolutionScale(float scale) {
const float SCALE_RANGE_MIN = 0.1f; const float SCALE_RANGE_MIN = 0.1f;
const float SCALE_RANGE_MAX = 2.0f; const float SCALE_RANGE_MAX = 2.0f;
resolutionScale = std::max(SCALE_RANGE_MIN, std::min(SCALE_RANGE_MAX, scale)); resolutionScale = std::max(SCALE_RANGE_MIN, std::min(SCALE_RANGE_MAX, scale));
// emit dirty();
} }
void PreparePrimaryFramebufferMSAAConfig::setNumSamples(int num) { void PreparePrimaryFramebufferMSAAConfig::setNumSamples(int num) {

4
libraries/render-utils/src/RenderForwardTask.h
View file

@ -42,8 +42,8 @@ public:
class PreparePrimaryFramebufferMSAAConfig : public render::Job::Config { class PreparePrimaryFramebufferMSAAConfig : public render::Job::Config {
Q_OBJECT Q_OBJECT
Q_PROPERTY(float resolutionScale WRITE setResolutionScale READ getResolutionScale NOTIFY dirty()) Q_PROPERTY(float resolutionScale WRITE setResolutionScale READ getResolutionScale NOTIFY dirty)
Q_PROPERTY(int numSamples WRITE setNumSamples READ getNumSamples NOTIFY dirty()) Q_PROPERTY(int numSamples WRITE setNumSamples READ getNumSamples NOTIFY dirty)
public: public:
float getResolutionScale() const { return resolutionScale; } float getResolutionScale() const { return resolutionScale; }
void setResolutionScale(float scale); void setResolutionScale(float scale);

2
libraries/task/src/task/Config.h
View file

@ -133,8 +133,6 @@ public:
*/ */
Q_INVOKABLE void load(const QVariantMap& map) { qObjectFromJsonValue(QJsonObject::fromVariantMap(map), *this); emit loaded(); } Q_INVOKABLE void load(const QVariantMap& map) { qObjectFromJsonValue(QJsonObject::fromVariantMap(map), *this); emit loaded(); }
//Q_INVOKABLE QObject* getConfig(const QString& name) { return nullptr; }
// Running Time measurement // Running Time measurement
// The new stats signal is emitted once per run time of a job when stats (cpu runtime) are updated // The new stats signal is emitted once per run time of a job when stats (cpu runtime) are updated
void setCPURunTime(const std::chrono::nanoseconds& runtime) { _msCPURunTime = std::chrono::duration<double, std::milli>(runtime).count(); emit newStats(); } void setCPURunTime(const std::chrono::nanoseconds& runtime) { _msCPURunTime = std::chrono::duration<double, std::milli>(runtime).count(); emit newStats(); }

1
libraries/task/src/task/Task.h
View file

@ -261,7 +261,6 @@ public:
_jobs.emplace_back((NT::JobModel::create(name, input, std::forward<NA>(args)...))); _jobs.emplace_back((NT::JobModel::create(name, input, std::forward<NA>(args)...)));
// Conect the child config to this task's config // Conect the child config to this task's config
// std::static_pointer_cast<TaskConfig>(Concept::getConfiguration())->connectChildConfig(_jobs.back().getConfiguration(), name);
std::static_pointer_cast<JobConfig>(Concept::getConfiguration())->connectChildConfig(_jobs.back().getConfiguration(), name); std::static_pointer_cast<JobConfig>(Concept::getConfiguration())->connectChildConfig(_jobs.back().getConfiguration(), name);
return _jobs.back().getOutput(); return _jobs.back().getOutput();

4
scripts/developer/utilities/render/luci2.js
View file

@ -69,8 +69,8 @@ function openView() {
} }
pages.addPage('Luci', 'Luci', '../luci.qml', 300, 420, openLuciWindow, closeLuciWindow); pages.addPage('Luci', 'Luci', '../luci.qml', 300, 420, openLuciWindow, closeLuciWindow);
// pages.addPage('openEngineLODView', 'Render LOD', '../lod.qml', 300, 400); pages.addPage('openEngineLODView', 'Render LOD', '../lod.qml', 300, 400);
// pages.addPage('openMaterialInspectorView', 'Material Inspector', '../materialInspector.qml', 300, 400, MaterialInspector.setWindow, MaterialInspector.setWindow); pages.addPage('openMaterialInspectorView', 'Material Inspector', '../materialInspector.qml', 300, 400, MaterialInspector.setWindow, MaterialInspector.setWindow);
pages.open('Luci'); pages.open('Luci');