diff --git a/examples/jpg_proxy_test/JPCJob.cpp b/examples/jpg_proxy_test/JPCJob.cpp index 0bd12af..61c6d79 100644 --- a/examples/jpg_proxy_test/JPCJob.cpp +++ b/examples/jpg_proxy_test/JPCJob.cpp @@ -80,6 +80,15 @@ bool JPCJob::init() rootLayout->addChild(compact_grid); m_model->setGUILayout(rootLayout, tinia::model::gui::DESKTOP); + // 150320: Debugging/testing of new feature; "invalidate" + m_model->updateElement("ap_splats", 20); + m_model->updateElement("ap_overlap", 51); + m_model->updateElement( "ap_debugSplatCol", true ); + m_model->updateElement( "ap_autoProxyDebugging", true ); + m_model->updateElement( "ap_screenSpaceSized", false ); + m_model->updateElement( "ap_splatOutline", true ); + m_model->updateElement( "ap_useAutoProxy", true ); + return true; } diff --git a/js/gui/Canvas.js b/js/gui/Canvas.js index 67a0bea..4ed8d8c 100644 --- a/js/gui/Canvas.js +++ b/js/gui/Canvas.js @@ -51,8 +51,8 @@ dojo.declare("gui.Canvas", [dijit._Widget], { this._boundingboxKey = params.boundingboxKey; this._resetViewKey = params.resetViewKey; this._renderListURL = params.renderListURL; - this._width = 512; - this._height = 512; + this._width = 1024; + this._height = 1024; this._modelLib = params.modelLib; // The modification of fields of 'params' in this constructor is probably not necessary, because the call (there seems to be // only one) to the constructor uses a very short-lived automatic variable that is not used again before going out of scope. diff --git a/js/gui/ProxyRenderer.js b/js/gui/ProxyRenderer.js index d86cf17..3127a89 100644 --- a/js/gui/ProxyRenderer.js +++ b/js/gui/ProxyRenderer.js @@ -697,6 +697,13 @@ dojo.declare("gui.ProxyRenderer", null, { this._lock = true; this._lock2 = false; } + if ( (this.exposedModel.hasKey("ap_invalidateAllModels")) && (this.exposedModel.getElementValue("ap_invalidateAllModels")) ) { + // Clearing out all stored proxy models that should be invalidated, and resetting the flag to false. + this.exposedModel.updateElement("ap_invalidateAllModels", false); + for (var i=0; i model, model->addAnnotation("ap_splats", "Number of splats)"); model->addElement( "ap_resetAllModels", false ); model->addAnnotation("ap_resetAllModels", "Reset and fix proxy"); + model->addElement( "ap_invalidateAllModels", false ); + model->addAnnotation("ap_invalidateAllModels", "Invalidate all AP-models"); model->addElement( "ap_useISTC", true ); model->addAnnotation("ap_useISTC", "Use intra-splat texcoo"); model->addElement( "ap_splatOutline", true ); @@ -269,6 +271,7 @@ void ProxyDebugGUI::resetSettingsClient() m_model->updateElement( "ap_overlap", 200); m_model->updateElement( "ap_alwaysShowMostRecent", true ); m_model->updateElement( "ap_resetAllModels", false ); + m_model->updateElement( "ap_invalidateAllModels", false ); m_model->updateElement( "ap_useISTC", true ); m_model->updateElement( "ap_splatOutline", false ); m_model->updateElement( "ap_reloadShader", false ); @@ -449,6 +452,8 @@ tinia::model::gui::Grid *ProxyDebugGUI::getGrid() mainGrid->setChild(row, 0, new tinia::model::gui::Label("ap_consoleLog", false)); mainGrid->setChild(row, 1, new tinia::model::gui::Label("ap_consoleLog", true)); row++; + mainGrid->setChild(row, 0, new tinia::model::gui::Button("ap_invalidateAllModels")); + row++; mainGrid->setChild(row, 0, new tinia::model::gui::VerticalExpandingSpace()); } @@ -511,6 +516,7 @@ tinia::model::gui::Grid *ProxyDebugGUI::getCompactGrid() mainGrid->setChild(0, 1, new tinia::model::gui::RadioButtons("ap_compactConnectionChoices")); mainGrid->setChild(1, 0, new tinia::model::gui::Label("ap_compactClientChoices")); mainGrid->setChild(1, 1, new tinia::model::gui::RadioButtons("ap_compactClientChoices")); + mainGrid->setChild(2, 0, new tinia::model::gui::Button("ap_invalidateAllModels")); // Medium choices for defaults mediumBandwidthMediumLatency();