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

Add pasteModels

Browse source
This commit is contained in:
Ryan Huffman 2014-07-30 18:31:58 -07:00
parent d777e4be53
commit 06294b403b
2 changed files with 9 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
interface/src/Application.cpp
View file

@ -1602,17 +1602,13 @@ void Application::importVoxels() {
}
void Application::importModels(const QString& filename) {
_importSucceded = false;
_modelClipboard.eraseAllOctreeElements();
_modelClipboard.readFromSVOFile(filename.toLocal8Bit().constData());
_modelClipboard.reaverageOctreeElements();
}
_models.getTree()->readFromSVOFile(filename.toLocal8Bit().constData());
_models.getTree()->reaverageOctreeElements();
// restore the main window's active state
_window->activateWindow();
emit importDone();
void Application::pasteModels(float x, float y, float z) {
_modelClipboard.sendModels(&_modelEditSender, x, y, z);
}
void Application::cutVoxels(const VoxelDetail& sourceVoxel) {
@ -2124,7 +2120,6 @@ void Application::update(float deltaTime) {
{
PerformanceTimer perfTimer("models");
_models.update(); // update the models...
_modelClipboardRenderer.update();
}
{
@ -2613,7 +2608,6 @@ void Application::updateShadowMap() {
_avatarManager.renderAvatars(Avatar::SHADOW_RENDER_MODE);
_particles.render(OctreeRenderer::SHADOW_RENDER_MODE);
_models.render(OctreeRenderer::SHADOW_RENDER_MODE);
_modelClipboardRenderer.render(OctreeRenderer::SHADOW_RENDER_MODE);
glDisable(GL_POLYGON_OFFSET_FILL);
@ -2814,7 +2808,6 @@ void Application::displaySide(Camera& whichCamera, bool selfAvatarOnly) {
PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings),
"Application::displaySide() ... models...");
_models.render();
_modelClipboardRenderer.render();
}
// render the ambient occlusion effect if enabled

3
interface/src/Application.h
View file

@ -200,6 +200,8 @@ public:
bool getImportSucceded() { return _importSucceded; }
VoxelSystem* getSharedVoxelSystem() { return &_sharedVoxelSystem; }
VoxelTree* getClipboard() { return &_clipboard; }
ModelTree* getModelClipboard() { return &_modelClipboard; }
ModelTreeRenderer* getModelClipboardRenderer() { return &_modelClipboardRenderer; }
Environment* getEnvironment() { return &_environment; }
bool isMousePressed() const { return _mousePressed; }
bool isMouseHidden() const { return _mouseHidden; }
@ -312,6 +314,7 @@ public slots:
void nodeKilled(SharedNodePointer node);
void packetSent(quint64 length);
void pasteModels(float x, float y, float z);
void exportModels(const QString& filename, float x, float y, float z, float scale);
void importModels(const QString& filename);