Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Changed: #1193 Improve layers in dialogs.

Browse source
This commit is contained in:
dnk-88 2011-01-15 11:25:51 +02:00
parent 351788a0f7
commit 89a224255d
37 changed files with 636 additions and 374 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
code/nel/tools/3d/object_viewer_qt/src/animation_form.ui
View file

@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>519</width> <width>489</width>
<height>98</height> <height>92</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
@ -18,8 +18,8 @@
</property> </property>
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>519</width> <width>489</width>
<height>98</height> <height>92</height>
</size> </size>
</property> </property>
<property name="maximumSize"> <property name="maximumSize">
@ -42,6 +42,12 @@
</property> </property>
<widget class="QWidget" name="dockWidgetContents"> <widget class="QWidget" name="dockWidgetContents">
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<property name="margin">
<number>9</number>
</property>
<property name="spacing">
<number>1</number>
</property>
<item row="0" column="0" colspan="7"> <item row="0" column="0" colspan="7">
<layout class="QHBoxLayout" name="horizontalLayout_3"> <layout class="QHBoxLayout" name="horizontalLayout_3">
<item> <item>

11
code/nel/tools/3d/object_viewer_qt/src/animation_set_form.ui
View file

@ -7,7 +7,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>300</width> <width>300</width>
<height>562</height> <height>576</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
@ -43,6 +43,9 @@
</size> </size>
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<property name="spacing">
<number>5</number>
</property>
<item row="0" column="0"> <item row="0" column="0">
<layout class="QHBoxLayout" name="horizontalLayout_2"> <layout class="QHBoxLayout" name="horizontalLayout_2">
<item> <item>
@ -139,9 +142,6 @@
<attribute name="headerVisible"> <attribute name="headerVisible">
<bool>false</bool> <bool>false</bool>
</attribute> </attribute>
<attribute name="headerVisible">
<bool>false</bool>
</attribute>
<column> <column>
<property name="text"> <property name="text">
<string notr="true">1</string> <string notr="true">1</string>
@ -183,9 +183,6 @@
<attribute name="headerVisible"> <attribute name="headerVisible">
<bool>false</bool> <bool>false</bool>
</attribute> </attribute>
<attribute name="headerVisible">
<bool>false</bool>
</attribute>
<column> <column>
<property name="text"> <property name="text">
<string notr="true">1</string> <string notr="true">1</string>

20
code/nel/tools/3d/object_viewer_qt/src/attrib_form.ui
View file

@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>276</width> <width>231</width>
<height>273</height> <height>213</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@ -17,6 +17,12 @@
<string/> <string/>
</property> </property>
<layout class="QGridLayout" name="gridLayout_2"> <layout class="QGridLayout" name="gridLayout_2">
<property name="margin">
<number>6</number>
</property>
<property name="spacing">
<number>5</number>
</property>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QComboBox" name="comboBox"> <widget class="QComboBox" name="comboBox">
<item> <item>
@ -32,9 +38,7 @@
</widget> </widget>
</item> </item>
<item row="2" column="0" colspan="3"> <item row="2" column="0" colspan="3">
<widget class="NLQT::CBasicEditWidget" name="constAttribPlaneWidget" native="true"> <widget class="NLQT::CBasicEditWidget" name="constAttribPlaneWidget" native="true"/>
<zorder>schemeWidget</zorder>
</widget>
</item> </item>
<item row="3" column="0" colspan="3"> <item row="3" column="0" colspan="3">
<widget class="NLQT::CColorEditWidget" name="constRGBAWidget" native="true"/> <widget class="NLQT::CColorEditWidget" name="constRGBAWidget" native="true"/>
@ -114,6 +118,12 @@
<bool>true</bool> <bool>true</bool>
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<property name="margin">
<number>0</number>
</property>
<property name="spacing">
<number>5</number>
</property>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QComboBox" name="schemeComboBox"/> <widget class="QComboBox" name="schemeComboBox"/>
</item> </item>

10
code/nel/tools/3d/object_viewer_qt/src/basic_edit_form.ui
View file

@ -6,14 +6,20 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>283</width> <width>241</width>
<height>99</height> <height>75</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Form</string> <string>Form</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<property name="margin">
<number>0</number>
</property>
<property name="spacing">
<number>5</number>
</property>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="label"> <widget class="QLabel" name="label">
<property name="text"> <property name="text">

10
code/nel/tools/3d/object_viewer_qt/src/color_edit_form.ui
View file

@ -6,14 +6,20 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>255</width> <width>204</width>
<height>116</height> <height>103</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Form</string> <string>Form</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<property name="margin">
<number>0</number>
</property>
<property name="spacing">
<number>5</number>
</property>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QSlider" name="rHorizontalSlider"> <widget class="QSlider" name="rHorizontalSlider">
<property name="sizePolicy"> <property name="sizePolicy">

33
code/nel/tools/3d/object_viewer_qt/src/constraint_mesh_form.ui
View file

@ -6,14 +6,20 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>238</width> <width>193</width>
<height>460</height> <height>366</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Form</string> <string>Form</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout_2"> <layout class="QGridLayout" name="gridLayout_2">
<property name="margin">
<number>0</number>
</property>
<property name="spacing">
<number>5</number>
</property>
<item row="0" column="0" colspan="2"> <item row="0" column="0" colspan="2">
<widget class="QGroupBox" name="groupBox"> <widget class="QGroupBox" name="groupBox">
<property name="title"> <property name="title">
@ -116,7 +122,7 @@
<enum>QTabWidget::South</enum> <enum>QTabWidget::South</enum>
</property> </property>
<property name="currentIndex"> <property name="currentIndex">
<number>1</number> <number>2</number>
</property> </property>
<property name="movable"> <property name="movable">
<bool>true</bool> <bool>true</bool>
@ -126,8 +132,17 @@
<string>Translation</string> <string>Translation</string>
</attribute> </attribute>
<layout class="QGridLayout" name="gridLayout_6"> <layout class="QGridLayout" name="gridLayout_6">
<property name="margin">
<number>6</number>
</property>
<property name="spacing">
<number>5</number>
</property>
<item row="0" column="0"> <item row="0" column="0">
<layout class="QGridLayout" name="gridLayout_3"> <layout class="QGridLayout" name="gridLayout_3">
<property name="spacing">
<number>5</number>
</property>
<item row="0" column="1"> <item row="0" column="1">
<widget class="QDoubleSpinBox" name="transUStartDoubleSpinBox"> <widget class="QDoubleSpinBox" name="transUStartDoubleSpinBox">
<property name="decimals"> <property name="decimals">
@ -257,8 +272,14 @@
<string>Scale</string> <string>Scale</string>
</attribute> </attribute>
<layout class="QGridLayout" name="gridLayout_5"> <layout class="QGridLayout" name="gridLayout_5">
<property name="margin">
<number>6</number>
</property>
<item row="0" column="0"> <item row="0" column="0">
<layout class="QGridLayout" name="gridLayout_4"> <layout class="QGridLayout" name="gridLayout_4">
<property name="spacing">
<number>5</number>
</property>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="label_9"> <widget class="QLabel" name="label_9">
<property name="text"> <property name="text">
@ -388,6 +409,12 @@
<string>Rotation</string> <string>Rotation</string>
</attribute> </attribute>
<layout class="QGridLayout" name="gridLayout_7"> <layout class="QGridLayout" name="gridLayout_7">
<property name="margin">
<number>6</number>
</property>
<property name="spacing">
<number>5</number>
</property>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="label_15"> <widget class="QLabel" name="label_15">
<property name="text"> <property name="text">

189
code/nel/tools/3d/object_viewer_qt/src/direction_form.ui
View file

@ -6,15 +6,21 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>268</width> <width>263</width>
<height>101</height> <height>95</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Form</string> <string>Form</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0" colspan="2"> <property name="margin">
<number>0</number>
</property>
<property name="spacing">
<number>5</number>
</property>
<item row="0" column="0">
<widget class="QLabel" name="label"> <widget class="QLabel" name="label">
<property name="text"> <property name="text">
<string>Direction:</string> <string>Direction:</string>
@ -22,45 +28,98 @@
</widget> </widget>
</item> </item>
<item row="1" column="0"> <item row="1" column="0">
<widget class="QPushButton" name="incVecIPushButton"> <layout class="QGridLayout" name="gridLayout">
<property name="maximumSize"> <property name="spacing">
<size> <number>3</number>
<width>30</width>
<height>16777215</height>
</size>
</property> </property>
<property name="text"> <item row="0" column="0">
<string>+I</string> <widget class="QPushButton" name="incVecIPushButton">
</property> <property name="maximumSize">
</widget> <size>
<width>30</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string>+I</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QPushButton" name="incVecJPushButton">
<property name="maximumSize">
<size>
<width>30</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string>+J</string>
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="QPushButton" name="incVecKPushButton">
<property name="maximumSize">
<size>
<width>30</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string>+K</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QPushButton" name="decVecIPushButton">
<property name="maximumSize">
<size>
<width>30</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string>-I</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QPushButton" name="decVecJPushButton">
<property name="maximumSize">
<size>
<width>30</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string>-J</string>
</property>
</widget>
</item>
<item row="1" column="2">
<widget class="QPushButton" name="decVecKPushButton">
<property name="maximumSize">
<size>
<width>30</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string>-K</string>
</property>
</widget>
</item>
<item row="2" column="0" colspan="3">
<widget class="QPushButton" name="globalPushButton">
<property name="text">
<string>Global</string>
</property>
</widget>
</item>
</layout>
</item> </item>
<item row="1" column="1"> <item row="1" column="1">
<widget class="QPushButton" name="incVecJPushButton">
<property name="maximumSize">
<size>
<width>30</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string>+J</string>
</property>
</widget>
</item>
<item row="1" column="2">
<widget class="QPushButton" name="incVecKPushButton">
<property name="maximumSize">
<size>
<width>30</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string>+K</string>
</property>
</widget>
</item>
<item row="1" column="3" rowspan="3">
<widget class="NLQT::CGraphicsInfoWidget" name="xzWidget" native="true"> <widget class="NLQT::CGraphicsInfoWidget" name="xzWidget" native="true">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed"> <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
@ -82,7 +141,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="4" rowspan="3"> <item row="1" column="2">
<widget class="NLQT::CGraphicsInfoWidget" name="yzWidget" native="true"> <widget class="NLQT::CGraphicsInfoWidget" name="yzWidget" native="true">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed"> <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
@ -104,7 +163,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="5" rowspan="2"> <item row="1" column="3">
<spacer name="horizontalSpacer"> <spacer name="horizontalSpacer">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
@ -117,52 +176,6 @@
</property> </property>
</spacer> </spacer>
</item> </item>
<item row="2" column="0">
<widget class="QPushButton" name="decVecIPushButton">
<property name="maximumSize">
<size>
<width>30</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string>-I</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QPushButton" name="decVecJPushButton">
<property name="maximumSize">
<size>
<width>30</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string>-J</string>
</property>
</widget>
</item>
<item row="2" column="2">
<widget class="QPushButton" name="decVecKPushButton">
<property name="maximumSize">
<size>
<width>30</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string>-K</string>
</property>
</widget>
</item>
<item row="3" column="0" colspan="3">
<widget class="QPushButton" name="globalPushButton">
<property name="text">
<string>Global</string>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
<customwidgets> <customwidgets>

10
code/nel/tools/3d/object_viewer_qt/src/edit_range_float_form.ui
View file

@ -6,14 +6,20 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>304</width> <width>273</width>
<height>39</height> <height>20</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Form</string> <string>Form</string>
</property> </property>
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QHBoxLayout" name="horizontalLayout">
<property name="spacing">
<number>5</number>
</property>
<property name="margin">
<number>0</number>
</property>
<item> <item>
<widget class="QDoubleSpinBox" name="startSpinBox"> <widget class="QDoubleSpinBox" name="startSpinBox">
<property name="buttonSymbols"> <property name="buttonSymbols">

10
code/nel/tools/3d/object_viewer_qt/src/edit_range_uint_form.ui
View file

@ -6,14 +6,20 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>294</width> <width>231</width>
<height>32</height> <height>20</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Form</string> <string>Form</string>
</property> </property>
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QHBoxLayout" name="horizontalLayout">
<property name="spacing">
<number>5</number>
</property>
<property name="margin">
<number>0</number>
</property>
<item> <item>
<widget class="QSpinBox" name="startSpinBox"> <widget class="QSpinBox" name="startSpinBox">
<property name="buttonSymbols"> <property name="buttonSymbols">

10
code/nel/tools/3d/object_viewer_qt/src/emitter_form.ui
View file

@ -6,14 +6,17 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>382</width> <width>349</width>
<height>450</height> <height>393</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Form</string> <string>Form</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout_3"> <layout class="QGridLayout" name="gridLayout_3">
<property name="margin">
<number>6</number>
</property>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QTabWidget" name="tabWidget"> <widget class="QTabWidget" name="tabWidget">
<property name="enabled"> <property name="enabled">
@ -33,6 +36,9 @@
<string>General</string> <string>General</string>
</attribute> </attribute>
<layout class="QGridLayout" name="gridLayout_4"> <layout class="QGridLayout" name="gridLayout_4">
<property name="spacing">
<number>5</number>
</property>
<item row="0" column="0" colspan="3"> <item row="0" column="0" colspan="3">
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<item row="0" column="0"> <item row="0" column="0">

57
code/nel/tools/3d/object_viewer_qt/src/hoverpoints.cpp
View file

@ -1,43 +1,20 @@
/**************************************************************************** // Object Viewer Qt - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
** // Copyright (C) 2010 Winch Gate Property Limited
** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). // Copyright (C) 2010 Dzmitry Kamiahin <dnk-88@tut.by>
** All rights reserved. // Parts by Nokia Corporation (qt-info@nokia.com) Copyright (C) 2009.
** Contact: Nokia Corporation (qt-info@nokia.com) //
** // This program is free software: you can redistribute it and/or modify
** This file is part of the demonstration applications of the Qt Toolkit. // it under the terms of the GNU Affero General Public License as
** // published by the Free Software Foundation, either version 3 of the
** $QT_BEGIN_LICENSE:LGPL$ // License, or (at your option) any later version.
** No Commercial Usage //
** This file contains pre-release code and may not be distributed. // This program is distributed in the hope that it will be useful,
** You may use this file in accordance with the terms and conditions // but WITHOUT ANY WARRANTY; without even the implied warranty of
** contained in the Technology Preview License Agreement accompanying // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
** this package. // GNU Affero General Public License for more details.
** //
** GNU Lesser General Public License Usage // You should have received a copy of the GNU Affero General Public License
** Alternatively, this file may be used under the terms of the GNU Lesser // along with this program. If not, see <http://www.gnu.org/licenses/>.
** General Public License version 2.1 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPL included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 2.1 requirements
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** In addition, as a special exception, Nokia gives you certain additional
** rights. These rights are described in the Nokia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** If you have questions regarding the use of this file, please contact
** Nokia at qt-info@nokia.com.
**
**
**
**
**
**
**
**
** $QT_END_LICENSE$
**
****************************************************************************/
#include "stdpch.h" #include "stdpch.h"
#include "hoverpoints.h" #include "hoverpoints.h"

57
code/nel/tools/3d/object_viewer_qt/src/hoverpoints.h
View file

@ -1,43 +1,20 @@
/**************************************************************************** // Object Viewer Qt - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
** // Copyright (C) 2010 Winch Gate Property Limited
** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). // Copyright (C) 2010 Dzmitry Kamiahin <dnk-88@tut.by>
** All rights reserved. // Parts by Nokia Corporation (qt-info@nokia.com) Copyright (C) 2009.
** Contact: Nokia Corporation (qt-info@nokia.com) //
** // This program is free software: you can redistribute it and/or modify
** This file is part of the demonstration applications of the Qt Toolkit. // it under the terms of the GNU Affero General Public License as
** // published by the Free Software Foundation, either version 3 of the
** $QT_BEGIN_LICENSE:LGPL$ // License, or (at your option) any later version.
** No Commercial Usage //
** This file contains pre-release code and may not be distributed. // This program is distributed in the hope that it will be useful,
** You may use this file in accordance with the terms and conditions // but WITHOUT ANY WARRANTY; without even the implied warranty of
** contained in the Technology Preview License Agreement accompanying // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
** this package. // GNU Affero General Public License for more details.
** //
** GNU Lesser General Public License Usage // You should have received a copy of the GNU Affero General Public License
** Alternatively, this file may be used under the terms of the GNU Lesser // along with this program. If not, see <http://www.gnu.org/licenses/>.
** General Public License version 2.1 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPL included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 2.1 requirements
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** In addition, as a special exception, Nokia gives you certain additional
** rights. These rights are described in the Nokia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** If you have questions regarding the use of this file, please contact
** Nokia at qt-info@nokia.com.
**
**
**
**
**
**
**
**
** $QT_END_LICENSE$
**
****************************************************************************/
#ifndef HOVERPOINTS_H #ifndef HOVERPOINTS_H
#define HOVERPOINTS_H #define HOVERPOINTS_H

211
code/nel/tools/3d/object_viewer_qt/src/located_bindable_form.ui
View file

@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>352</width> <width>262</width>
<height>494</height> <height>473</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
@ -19,7 +19,13 @@
<property name="windowTitle"> <property name="windowTitle">
<string>Form</string> <string>Form</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout_10">
<property name="horizontalSpacing">
<number>5</number>
</property>
<property name="margin">
<number>6</number>
</property>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QTabWidget" name="tabWidget"> <widget class="QTabWidget" name="tabWidget">
<property name="sizePolicy"> <property name="sizePolicy">
@ -54,7 +60,7 @@
<string/> <string/>
</attribute> </attribute>
<layout class="QGridLayout" name="gridLayout_2"> <layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0" colspan="3"> <item row="0" column="0">
<layout class="QHBoxLayout" name="horizontalLayout_2"> <layout class="QHBoxLayout" name="horizontalLayout_2">
<item> <item>
<widget class="QLabel" name="blendModeLabel"> <widget class="QLabel" name="blendModeLabel">
@ -90,11 +96,22 @@
</layout> </layout>
</item> </item>
<item row="1" column="0"> <item row="1" column="0">
<widget class="QCheckBox" name="globalColorLightingCheckBox"> <layout class="QHBoxLayout" name="horizontalLayout_3">
<property name="text"> <item>
<string>Global color lighting</string> <widget class="QCheckBox" name="autoLodCheckBox">
</property> <property name="text">
</widget> <string>No AutoLOD</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="globalColorLightingCheckBox">
<property name="text">
<string>Global color lighting</string>
</property>
</widget>
</item>
</layout>
</item> </item>
<item row="2" column="0"> <item row="2" column="0">
<widget class="QCheckBox" name="ztestCheckBox"> <widget class="QCheckBox" name="ztestCheckBox">
@ -124,7 +141,14 @@
</item> </item>
</layout> </layout>
</item> </item>
<item row="5" column="1"> <item row="4" column="0">
<widget class="NLQT::CAttribRGBAWidget" name="colorWidget">
<property name="title">
<string>Color</string>
</property>
</widget>
</item>
<item row="5" column="0">
<spacer name="verticalSpacer"> <spacer name="verticalSpacer">
<property name="orientation"> <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
@ -137,20 +161,6 @@
</property> </property>
</spacer> </spacer>
</item> </item>
<item row="1" column="1">
<widget class="QCheckBox" name="autoLodCheckBox">
<property name="text">
<string>No AutoLOD</string>
</property>
</widget>
</item>
<item row="4" column="0" colspan="3">
<widget class="NLQT::CAttribRGBAWidget" name="colorWidget">
<property name="title">
<string>Color</string>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
<widget class="QWidget" name="sizeAnglePage"> <widget class="QWidget" name="sizeAnglePage">
@ -171,7 +181,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="2"> <item row="1" column="0">
<widget class="QGroupBox" name="independantGroupBox"> <widget class="QGroupBox" name="independantGroupBox">
<property name="enabled"> <property name="enabled">
<bool>false</bool> <bool>false</bool>
@ -180,6 +190,19 @@
<string/> <string/>
</property> </property>
<layout class="QGridLayout" name="gridLayout_3"> <layout class="QGridLayout" name="gridLayout_3">
<property name="margin">
<number>9</number>
</property>
<property name="spacing">
<number>6</number>
</property>
<item row="0" column="1">
<widget class="QRadioButton" name="heightRadioButton">
<property name="text">
<string>Height</string>
</property>
</widget>
</item>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QRadioButton" name="widthRadioButton"> <widget class="QRadioButton" name="widthRadioButton">
<property name="text"> <property name="text">
@ -190,17 +213,24 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="1">
<widget class="QRadioButton" name="heightRadioButton">
<property name="text">
<string>Height</string>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="3" column="1"> <item row="2" column="0">
<widget class="NLQT::CAttribFloatWidget" name="sizeWidget">
<property name="title">
<string>Size</string>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="NLQT::CAttribFloatWidget" name="angle2DWidget">
<property name="title">
<string>Angle 2D</string>
</property>
</widget>
</item>
<item row="4" column="0">
<spacer name="verticalSpacer_2"> <spacer name="verticalSpacer_2">
<property name="orientation"> <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
@ -213,20 +243,6 @@
</property> </property>
</spacer> </spacer>
</item> </item>
<item row="1" column="0" colspan="3">
<widget class="NLQT::CAttribFloatWidget" name="sizeWidget">
<property name="title">
<string>Size</string>
</property>
</widget>
</item>
<item row="2" column="0" colspan="3">
<widget class="NLQT::CAttribFloatWidget" name="angle2DWidget">
<property name="title">
<string>Angle 2D</string>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
<widget class="QWidget" name="rotatePage"> <widget class="QWidget" name="rotatePage">
@ -240,6 +256,13 @@
<string/> <string/>
</attribute> </attribute>
<layout class="QGridLayout" name="gridLayout_7"> <layout class="QGridLayout" name="gridLayout_7">
<item row="0" column="0">
<widget class="NLQT::CAttribPlaneBasisWidget" name="particlePlaneBasicWidget">
<property name="title">
<string>Rotation</string>
</property>
</widget>
</item>
<item row="1" column="0"> <item row="1" column="0">
<widget class="QCheckBox" name="rotationPCCheckBox"> <widget class="QCheckBox" name="rotationPCCheckBox">
<property name="text"> <property name="text">
@ -256,6 +279,12 @@
<string/> <string/>
</property> </property>
<layout class="QGridLayout" name="gridLayout_5"> <layout class="QGridLayout" name="gridLayout_5">
<property name="margin">
<number>6</number>
</property>
<property name="spacing">
<number>5</number>
</property>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="label_3"> <widget class="QLabel" name="label_3">
<property name="text"> <property name="text">
@ -309,13 +338,6 @@
</property> </property>
</spacer> </spacer>
</item> </item>
<item row="0" column="0">
<widget class="NLQT::CAttribPlaneBasisWidget" name="particlePlaneBasicWidget">
<property name="title">
<string>Rotation</string>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
<widget class="QWidget" name="lookAtPage"> <widget class="QWidget" name="lookAtPage">
@ -396,7 +418,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0" colspan="2"> <item row="1" column="0">
<widget class="NLQT::CEditRangeFloatWidget" name="radiusCutWidget" native="true"/> <widget class="NLQT::CEditRangeFloatWidget" name="radiusCutWidget" native="true"/>
</item> </item>
<item row="2" column="0"> <item row="2" column="0">
@ -406,7 +428,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="0" colspan="2"> <item row="3" column="0">
<widget class="NLQT::CEditRangeUIntWidget" name="shockWaveNbSegWidget" native="true"/> <widget class="NLQT::CEditRangeUIntWidget" name="shockWaveNbSegWidget" native="true"/>
</item> </item>
<item row="4" column="0"> <item row="4" column="0">
@ -416,10 +438,10 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="5" column="0" colspan="2"> <item row="5" column="0">
<widget class="NLQT::CEditRangeFloatWidget" name="shockWaveUFactorWidget" native="true"/> <widget class="NLQT::CEditRangeFloatWidget" name="shockWaveUFactorWidget" native="true"/>
</item> </item>
<item row="6" column="1"> <item row="6" column="0">
<spacer name="verticalSpacer_5"> <spacer name="verticalSpacer_5">
<property name="orientation"> <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
@ -518,7 +540,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0" colspan="2"> <item row="1" column="0">
<widget class="NLQT::CEditRangeUIntWidget" name="tailNbSegsWidget" native="true"/> <widget class="NLQT::CEditRangeUIntWidget" name="tailNbSegsWidget" native="true"/>
</item> </item>
<item row="2" column="0"> <item row="2" column="0">
@ -528,60 +550,70 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="0" colspan="2"> <item row="3" column="0">
<widget class="NLQT::CEditRangeFloatWidget" name="segDurationWidget" native="true"/> <widget class="NLQT::CEditRangeFloatWidget" name="segDurationWidget" native="true"/>
</item> </item>
<item row="4" column="0" colspan="2"> <item row="4" column="0">
<widget class="QLabel" name="tailTexUflabel"> <widget class="QLabel" name="tailTexUflabel">
<property name="text"> <property name="text">
<string>Texture U factor:</string> <string>Texture U factor:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="5" column="0" colspan="2"> <item row="5" column="0">
<widget class="NLQT::CEditRangeFloatWidget" name="ribbonTexUfactorWidget" native="true"/> <widget class="NLQT::CEditRangeFloatWidget" name="ribbonTexUfactorWidget" native="true"/>
</item> </item>
<item row="6" column="0" colspan="2"> <item row="6" column="0">
<widget class="QLabel" name="tailTexVflabel"> <widget class="QLabel" name="tailTexVflabel">
<property name="text"> <property name="text">
<string>Texture V factor:</string> <string>Texture V factor:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="7" column="0" colspan="2"> <item row="7" column="0">
<widget class="NLQT::CEditRangeFloatWidget" name="ribbonTexVfactorWidget" native="true"/> <widget class="NLQT::CEditRangeFloatWidget" name="ribbonTexVfactorWidget" native="true"/>
</item> </item>
<item row="8" column="0" colspan="2"> <item row="8" column="0">
<widget class="QGroupBox" name="ribbonGroupBox"> <widget class="QGroupBox" name="ribbonGroupBox">
<property name="title"> <property name="title">
<string/> <string/>
</property> </property>
<layout class="QGridLayout" name="gridLayout_10"> <layout class="QGridLayout" name="gridLayout">
<item row="0" column="0"> <item row="0" column="0">
<widget class="QCheckBox" name="constantLengthCheckBox"> <widget class="QCheckBox" name="constantLengthCheckBox">
<property name="toolTip"> <property name="toolTip">
<string>Non parametric anim only</string> <string>Non parametric anim only</string>
</property> </property>
<property name="text"> <property name="text">
<string>Force constant length</string> <string>Force constant length(m):</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QCheckBox" name="useHermitteCheckBox">
<property name="text">
<string>Use hermitte interpolation</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0"> <item row="1" column="0">
<widget class="NLQT::CEditRangeFloatWidget" name="ribbonLengthWidget" native="true">
<property name="enabled">
<bool>false</bool>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="lodDegradationLabel">
<property name="text">
<string>LOD degradation:</string>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="NLQT::CEditRangeFloatWidget" name="lodDegradationWidget" native="true"/>
</item>
<item row="4" column="0">
<widget class="QLabel" name="label_15"> <widget class="QLabel" name="label_15">
<property name="text"> <property name="text">
<string>Trail coord. system:</string> <string>Trail coord. system:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="1"> <item row="5" column="0">
<widget class="QComboBox" name="coordSystemComboBox"> <widget class="QComboBox" name="coordSystemComboBox">
<item> <item>
<property name="text"> <property name="text">
@ -605,37 +637,20 @@
</item> </item>
</widget> </widget>
</item> </item>
<item row="2" column="0"> <item row="6" column="0">
<widget class="QLabel" name="ribbonLengthLabel"> <widget class="QCheckBox" name="useHermitteCheckBox">
<property name="text"> <property name="text">
<string>Length(m):</string> <string>Use hermitte interpolation</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="0" colspan="2">
<widget class="NLQT::CEditRangeFloatWidget" name="ribbonLengthWidget" native="true">
<property name="enabled">
<bool>false</bool>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="lodDegradationLabel">
<property name="text">
<string>LOD degradation:</string>
</property>
</widget>
</item>
<item row="5" column="0" colspan="2">
<widget class="NLQT::CEditRangeFloatWidget" name="lodDegradationWidget" native="true"/>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="9" column="0" colspan="2"> <item row="9" column="0">
<widget class="NLQT::CTailParticleWidget" name="tailWidget" native="true"/> <widget class="NLQT::CTailParticleWidget" name="tailWidget" native="true"/>
</item> </item>
<item row="10" column="1"> <item row="10" column="0">
<spacer name="verticalSpacer_7"> <spacer name="verticalSpacer_7">
<property name="orientation"> <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
@ -643,7 +658,7 @@
<property name="sizeHint" stdset="0"> <property name="sizeHint" stdset="0">
<size> <size>
<width>20</width> <width>20</width>
<height>133</height> <height>100</height>
</size> </size>
</property> </property>
</spacer> </spacer>

1
code/nel/tools/3d/object_viewer_qt/src/located_bindable_page.cpp
View file

@ -616,7 +616,6 @@ void CLocatedBindablePage::setConstantLength(bool state)
NL3D::CPSRibbonBase *ribbon = dynamic_cast<NL3D::CPSRibbonBase *>(_Bindable); NL3D::CPSRibbonBase *ribbon = dynamic_cast<NL3D::CPSRibbonBase *>(_Bindable);
ribbon->setRibbonMode(state ? NL3D::CPSRibbonBase::FixedSize : NL3D::CPSRibbonBase::VariableSize); ribbon->setRibbonMode(state ? NL3D::CPSRibbonBase::FixedSize : NL3D::CPSRibbonBase::VariableSize);
_ui.ribbonLengthWidget->setEnabled(state); _ui.ribbonLengthWidget->setEnabled(state);
_ui.ribbonLengthLabel->setEnabled(state);
} }
void CLocatedBindablePage::setTrailCoordSystem(int index) void CLocatedBindablePage::setTrailCoordSystem(int index)

10
code/nel/tools/3d/object_viewer_qt/src/located_form.ui
View file

@ -6,14 +6,17 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>291</width> <width>259</width>
<height>410</height> <height>353</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Form</string> <string>Form</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<property name="margin">
<number>6</number>
</property>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QTabWidget" name="tabWidget"> <widget class="QTabWidget" name="tabWidget">
<property name="tabPosition"> <property name="tabPosition">
@ -152,6 +155,9 @@
<string/> <string/>
</property> </property>
<layout class="QGridLayout" name="gridLayout_3"> <layout class="QGridLayout" name="gridLayout_3">
<property name="spacing">
<number>5</number>
</property>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QCheckBox" name="trigerOnDeathCheckBox"> <widget class="QCheckBox" name="trigerOnDeathCheckBox">
<property name="text"> <property name="text">

10
code/nel/tools/3d/object_viewer_qt/src/mesh_form.ui
View file

@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>195</width> <width>180</width>
<height>118</height> <height>110</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@ -17,6 +17,12 @@
<string/> <string/>
</property> </property>
<layout class="QGridLayout" name="gridLayout_2"> <layout class="QGridLayout" name="gridLayout_2">
<property name="margin">
<number>6</number>
</property>
<property name="spacing">
<number>5</number>
</property>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="label"> <widget class="QLabel" name="label">
<property name="text"> <property name="text">

28
code/nel/tools/3d/object_viewer_qt/src/particle_control_form.ui
View file

@ -6,14 +6,14 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>941</width> <width>913</width>
<height>111</height> <height>88</height>
</rect> </rect>
</property> </property>
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>941</width> <width>913</width>
<height>111</height> <height>88</height>
</size> </size>
</property> </property>
<property name="maximumSize"> <property name="maximumSize">
@ -27,6 +27,12 @@
</property> </property>
<widget class="QWidget" name="dockWidgetContents"> <widget class="QWidget" name="dockWidgetContents">
<layout class="QGridLayout" name="gridLayout_5"> <layout class="QGridLayout" name="gridLayout_5">
<property name="margin">
<number>6</number>
</property>
<property name="spacing">
<number>5</number>
</property>
<item row="0" column="0" rowspan="2"> <item row="0" column="0" rowspan="2">
<widget class="QToolButton" name="playToolButton"> <widget class="QToolButton" name="playToolButton">
<property name="sizePolicy"> <property name="sizePolicy">
@ -104,12 +110,18 @@
</sizepolicy> </sizepolicy>
</property> </property>
<property name="currentIndex"> <property name="currentIndex">
<number>0</number> <number>1</number>
</property> </property>
<widget class="QWidget" name="pageGeneral"> <widget class="QWidget" name="pageGeneral">
<layout class="QGridLayout" name="gridLayout_2"> <layout class="QGridLayout" name="gridLayout_2">
<property name="margin">
<number>0</number>
</property>
<item row="0" column="0"> <item row="0" column="0">
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<property name="spacing">
<number>4</number>
</property>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QCheckBox" name="loopCheckBox"> <widget class="QCheckBox" name="loopCheckBox">
<property name="sizePolicy"> <property name="sizePolicy">
@ -197,6 +209,9 @@
</widget> </widget>
<widget class="QWidget" name="pageAdditional"> <widget class="QWidget" name="pageAdditional">
<layout class="QGridLayout" name="gridLayout_4"> <layout class="QGridLayout" name="gridLayout_4">
<property name="margin">
<number>0</number>
</property>
<item row="0" column="0"> <item row="0" column="0">
<layout class="QGridLayout" name="gridLayout_3"> <layout class="QGridLayout" name="gridLayout_3">
<item row="0" column="0"> <item row="0" column="0">
@ -287,6 +302,9 @@
</item> </item>
<item row="0" column="3" rowspan="2"> <item row="0" column="3" rowspan="2">
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<property name="spacing">
<number>3</number>
</property>
<item> <item>
<widget class="QToolButton" name="generalToolButton"> <widget class="QToolButton" name="generalToolButton">
<property name="sizePolicy"> <property name="sizePolicy">

10
code/nel/tools/3d/object_viewer_qt/src/particle_force_form.ui
View file

@ -6,14 +6,17 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>298</width> <width>243</width>
<height>458</height> <height>451</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Form</string> <string>Form</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<property name="margin">
<number>6</number>
</property>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QTabWidget" name="tabWidget"> <widget class="QTabWidget" name="tabWidget">
<property name="tabPosition"> <property name="tabPosition">
@ -27,6 +30,9 @@
<string>Target</string> <string>Target</string>
</attribute> </attribute>
<layout class="QGridLayout" name="gridLayout_2"> <layout class="QGridLayout" name="gridLayout_2">
<property name="spacing">
<number>3</number>
</property>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="label_2"> <widget class="QLabel" name="label_2">
<property name="text"> <property name="text">

3
code/nel/tools/3d/object_viewer_qt/src/particle_light_form.ui
View file

@ -14,6 +14,9 @@
<string>Form</string> <string>Form</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<property name="margin">
<number>6</number>
</property>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QTabWidget" name="tabWidget"> <widget class="QTabWidget" name="tabWidget">
<property name="tabPosition"> <property name="tabPosition">

2
code/nel/tools/3d/object_viewer_qt/src/particle_property_dialog.cpp
View file

@ -49,11 +49,13 @@ void CPropertyDialog::setupUi()
_dockWidgetContents = new QWidget(); _dockWidgetContents = new QWidget();
_gridLayout = new QGridLayout(_dockWidgetContents); _gridLayout = new QGridLayout(_dockWidgetContents);
_gridLayout->setContentsMargins(6, 6, 6, 6);
_scrollArea = new QScrollArea(_dockWidgetContents); _scrollArea = new QScrollArea(_dockWidgetContents);
_scrollArea->setWidgetResizable(true); _scrollArea->setWidgetResizable(true);
_scrollAreaWidgetContents = new QWidget(); _scrollAreaWidgetContents = new QWidget();
_pagesGridLayout = new QGridLayout(_scrollAreaWidgetContents); _pagesGridLayout = new QGridLayout(_scrollAreaWidgetContents);
_pagesGridLayout->setContentsMargins(0, 0, 0, 0);
_stackedWidget = new QStackedWidget(_scrollAreaWidgetContents); _stackedWidget = new QStackedWidget(_scrollAreaWidgetContents);

7
code/nel/tools/3d/object_viewer_qt/src/particle_sound_form.ui
View file

@ -6,14 +6,17 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>314</width> <width>239</width>
<height>334</height> <height>264</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Form</string> <string>Form</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<property name="margin">
<number>6</number>
</property>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QTabWidget" name="tabWidget"> <widget class="QTabWidget" name="tabWidget">
<property name="tabPosition"> <property name="tabPosition">

7
code/nel/tools/3d/object_viewer_qt/src/particle_system_form.ui
View file

@ -6,14 +6,17 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>334</width> <width>312</width>
<height>495</height> <height>496</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Form</string> <string>Form</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<property name="margin">
<number>6</number>
</property>
<item row="0" column="1"> <item row="0" column="1">
<widget class="QTabWidget" name="tabWidget"> <widget class="QTabWidget" name="tabWidget">
<property name="tabPosition"> <property name="tabPosition">

15
code/nel/tools/3d/object_viewer_qt/src/particle_texture_anim_form.ui
View file

@ -6,18 +6,24 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>306</width> <width>212</width>
<height>186</height> <height>101</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Form</string> <string>Form</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout_2"> <layout class="QGridLayout" name="gridLayout_2">
<property name="margin">
<number>0</number>
</property>
<property name="spacing">
<number>5</number>
</property>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QCheckBox" name="texAnimCheckBox"> <widget class="QCheckBox" name="texAnimCheckBox">
<property name="text"> <property name="text">
<string>Enable texture animation</string> <string>Enable texture anim</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -33,6 +39,9 @@
<string/> <string/>
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<property name="spacing">
<number>5</number>
</property>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QCheckBox" name="multitexturingCheckBox"> <widget class="QCheckBox" name="multitexturingCheckBox">
<property name="text"> <property name="text">

79
code/nel/tools/3d/object_viewer_qt/src/particle_texture_form.ui
View file

@ -6,14 +6,20 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>191</width> <width>172</width>
<height>176</height> <height>161</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Form</string> <string>Form</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<property name="margin">
<number>0</number>
</property>
<property name="spacing">
<number>5</number>
</property>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QScrollArea" name="scrollArea"> <widget class="QScrollArea" name="scrollArea">
<property name="minimumSize"> <property name="minimumSize">
@ -58,10 +64,59 @@
</widget> </widget>
</widget> </widget>
</item> </item>
<item row="0" column="1" rowspan="3">
<widget class="QGroupBox" name="groupBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="title">
<string/>
</property>
<layout class="QGridLayout" name="gridLayout_3">
<item row="0" column="0">
<widget class="QLabel" name="nameLabel">
<property name="text">
<string>Name:</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="sizeLabel">
<property name="text">
<string>Size:</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="memoryLabel">
<property name="text">
<string>Memory:</string>
</property>
</widget>
</item>
<item row="3" column="0">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>81</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
<item row="1" column="0"> <item row="1" column="0">
<widget class="QPushButton" name="chooseTexPushButton"> <widget class="QPushButton" name="chooseTexPushButton">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed"> <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
@ -74,7 +129,7 @@
<item row="2" column="0"> <item row="2" column="0">
<widget class="QPushButton" name="removePushButton"> <widget class="QPushButton" name="removePushButton">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed"> <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
@ -84,22 +139,6 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="1">
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>7</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout> </layout>
</widget> </widget>
<resources/> <resources/>

6
code/nel/tools/3d/object_viewer_qt/src/particle_workspace_form.ui
View file

@ -15,6 +15,9 @@
</property> </property>
<widget class="QWidget" name="dockWidgetContents"> <widget class="QWidget" name="dockWidgetContents">
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<property name="margin">
<number>5</number>
</property>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QTreeView" name="treeView"> <widget class="QTreeView" name="treeView">
<property name="animated"> <property name="animated">
@ -23,9 +26,6 @@
<attribute name="headerVisible"> <attribute name="headerVisible">
<bool>false</bool> <bool>false</bool>
</attribute> </attribute>
<attribute name="headerVisible">
<bool>false</bool>
</attribute>
</widget> </widget>
</item> </item>
</layout> </layout>

10
code/nel/tools/3d/object_viewer_qt/src/particle_zone_form.ui
View file

@ -6,14 +6,20 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>246</width> <width>210</width>
<height>350</height> <height>302</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Form</string> <string>Form</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<property name="margin">
<number>9</number>
</property>
<property name="spacing">
<number>6</number>
</property>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="label_2"> <widget class="QLabel" name="label_2">
<property name="text"> <property name="text">

3
code/nel/tools/3d/object_viewer_qt/src/plugins/example/example.pro
View file

@ -8,5 +8,4 @@ HEADERS += plugin1.h \
../../extension_system/iplugin.h \ ../../extension_system/iplugin.h \
../../extension_system/iplugin_manager.h \ ../../extension_system/iplugin_manager.h \
../../extension_system/plugin_spec.h ../../extension_system/plugin_spec.h
SOURCES += plugin1.cpp \ SOURCES += plugin1.cpp
../../extension_system/plugin_spec.cpp

7
code/nel/tools/3d/object_viewer_qt/src/settings_dialog.cpp
View file

@ -49,6 +49,8 @@ CSettingsDialog::CSettingsDialog(QWidget *parent)
loadPathsSettings(); loadPathsSettings();
loadVegetableSettings(); loadVegetableSettings();
connect(ui.buttonBox, SIGNAL(accepted()), this, SLOT(applyPressed()));
connect(ui.enableBloomCheckBox, SIGNAL(toggled(bool)), this, SLOT(setEnableBloom(bool))); connect(ui.enableBloomCheckBox, SIGNAL(toggled(bool)), this, SLOT(setEnableBloom(bool)));
connect(ui.squareBloomCheckBox, SIGNAL(toggled(bool)), this, SLOT(setEnableSquareBloon(bool))); connect(ui.squareBloomCheckBox, SIGNAL(toggled(bool)), this, SLOT(setEnableSquareBloon(bool)));
connect(ui.bloomDensityHorizontalSlider, SIGNAL(valueChanged(int)), this, SLOT(setDensityBloom(int))); connect(ui.bloomDensityHorizontalSlider, SIGNAL(valueChanged(int)), this, SLOT(setDensityBloom(int)));
@ -57,8 +59,7 @@ CSettingsDialog::CSettingsDialog(QWidget *parent)
connect(ui.removeToolButton, SIGNAL(clicked()), this, SLOT(removePath())); connect(ui.removeToolButton, SIGNAL(clicked()), this, SLOT(removePath()));
connect(ui.upToolButton, SIGNAL(clicked()), this, SLOT(upPath())); connect(ui.upToolButton, SIGNAL(clicked()), this, SLOT(upPath()));
connect(ui.downToolButton, SIGNAL(clicked()), this, SLOT(downPath())); connect(ui.downToolButton, SIGNAL(clicked()), this, SLOT(downPath()));
connect(ui.buttonBox, SIGNAL(accepted()), this, SLOT(applyPressed()));
connect(ui.tileBankToolButton, SIGNAL(clicked()), this, SLOT(setTileBank())); connect(ui.tileBankToolButton, SIGNAL(clicked()), this, SLOT(setTileBank()));
connect(ui.tileFarBankToolButton, SIGNAL(clicked()), this, SLOT(setTileFarBank())); connect(ui.tileFarBankToolButton, SIGNAL(clicked()), this, SLOT(setTileFarBank()));
connect(ui.vegetTexToolButton, SIGNAL(clicked()), this, SLOT(setTextureVegetable())); connect(ui.vegetTexToolButton, SIGNAL(clicked()), this, SLOT(setTextureVegetable()));
@ -176,7 +177,7 @@ void CSettingsDialog::addZone()
{ {
QStringList fileNames = QFileDialog::getOpenFileNames(this, QStringList fileNames = QFileDialog::getOpenFileNames(this,
tr("Add zone files"), ".", tr("Add zone files"), ".",
tr("Zonel files (*.zonel);;")); tr("Zonel files (*.zonel *.zone);;"));
if (!fileNames.isEmpty()) if (!fileNames.isEmpty())
{ {

27
code/nel/tools/3d/object_viewer_qt/src/skeleton_scale_form.ui
View file

@ -15,14 +15,17 @@
</property> </property>
<widget class="QWidget" name="dockWidgetContents"> <widget class="QWidget" name="dockWidgetContents">
<layout class="QGridLayout" name="gridLayout_5"> <layout class="QGridLayout" name="gridLayout_5">
<property name="margin">
<number>6</number>
</property>
<property name="spacing">
<number>5</number>
</property>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QTreeView" name="treeView"> <widget class="QTreeView" name="treeView">
<attribute name="headerVisible"> <attribute name="headerVisible">
<bool>true</bool> <bool>true</bool>
</attribute> </attribute>
<attribute name="headerVisible">
<bool>true</bool>
</attribute>
</widget> </widget>
</item> </item>
<item row="1" column="0"> <item row="1" column="0">
@ -34,6 +37,12 @@
<string>Bone scale</string> <string>Bone scale</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<property name="margin">
<number>6</number>
</property>
<property name="spacing">
<number>5</number>
</property>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="label"> <widget class="QLabel" name="label">
<property name="text"> <property name="text">
@ -253,6 +262,12 @@
<string>Skin scale (slower)</string> <string>Skin scale (slower)</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout_2"> <layout class="QGridLayout" name="gridLayout_2">
<property name="margin">
<number>6</number>
</property>
<property name="spacing">
<number>5</number>
</property>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="label_4"> <widget class="QLabel" name="label_4">
<property name="text"> <property name="text">
@ -472,6 +487,12 @@
<string/> <string/>
</property> </property>
<layout class="QGridLayout" name="gridLayout_4"> <layout class="QGridLayout" name="gridLayout_4">
<property name="margin">
<number>6</number>
</property>
<property name="spacing">
<number>5</number>
</property>
<item row="0" column="0"> <item row="0" column="0">
<layout class="QGridLayout" name="gridLayout_3"> <layout class="QGridLayout" name="gridLayout_3">
<item row="0" column="0" colspan="2"> <item row="0" column="0" colspan="2">

6
code/nel/tools/3d/object_viewer_qt/src/slot_form.ui
View file

@ -26,6 +26,12 @@
<bool>false</bool> <bool>false</bool>
</property> </property>
<layout class="QGridLayout" name="gridLayout_2"> <layout class="QGridLayout" name="gridLayout_2">
<property name="margin">
<number>6</number>
</property>
<property name="spacing">
<number>5</number>
</property>
<item row="0" column="0" colspan="2"> <item row="0" column="0" colspan="2">
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<item row="0" column="0"> <item row="0" column="0">

10
code/nel/tools/3d/object_viewer_qt/src/tail_form.ui
View file

@ -6,14 +6,20 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>206</width> <width>187</width>
<height>90</height> <height>72</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Form</string> <string>Form</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<property name="margin">
<number>0</number>
</property>
<property name="spacing">
<number>5</number>
</property>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QComboBox" name="ribbonOrientationComboBox"> <widget class="QComboBox" name="ribbonOrientationComboBox">
<property name="toolTip"> <property name="toolTip">

49
code/nel/tools/3d/object_viewer_qt/src/vegetable_apperance_form.ui
View file

@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>340</width> <width>273</width>
<height>309</height> <height>252</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@ -16,6 +16,12 @@
<layout class="QGridLayout" name="gridLayout_4"> <layout class="QGridLayout" name="gridLayout_4">
<item row="0" column="0"> <item row="0" column="0">
<widget class="QTabWidget" name="tabWidget"> <widget class="QTabWidget" name="tabWidget">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="tabPosition"> <property name="tabPosition">
<enum>QTabWidget::South</enum> <enum>QTabWidget::South</enum>
</property> </property>
@ -36,6 +42,18 @@
<string>Bend Phase</string> <string>Bend Phase</string>
</attribute> </attribute>
<layout class="QGridLayout" name="gridLayout_2"> <layout class="QGridLayout" name="gridLayout_2">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>6</number>
</property>
<item row="0" column="0"> <item row="0" column="0">
<widget class="NLQT::CVegetNoiseValueWidget" name="bendPhaseGroupBox"> <widget class="NLQT::CVegetNoiseValueWidget" name="bendPhaseGroupBox">
<property name="title"> <property name="title">
@ -50,6 +68,18 @@
<string>Bend Factor</string> <string>Bend Factor</string>
</attribute> </attribute>
<layout class="QGridLayout" name="gridLayout_3"> <layout class="QGridLayout" name="gridLayout_3">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>6</number>
</property>
<item row="0" column="0"> <item row="0" column="0">
<widget class="NLQT::CVegetNoiseValueWidget" name="bendFactorGroupBox"> <widget class="NLQT::CVegetNoiseValueWidget" name="bendFactorGroupBox">
<property name="title"> <property name="title">
@ -77,7 +107,7 @@
<item row="0" column="0" colspan="4"> <item row="0" column="0" colspan="4">
<widget class="QListWidget" name="listWidget"> <widget class="QListWidget" name="listWidget">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred"> <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
@ -136,19 +166,6 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="3" column="0">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>34</height>
</size>
</property>
</spacer>
</item>
</layout> </layout>
</widget> </widget>
<customwidgets> <customwidgets>

41
code/nel/tools/3d/object_viewer_qt/src/vegetable_dialog_form.ui
View file

@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>618</width> <width>504</width>
<height>679</height> <height>473</height>
</rect> </rect>
</property> </property>
<property name="windowIcon"> <property name="windowIcon">
@ -19,6 +19,12 @@
</property> </property>
<widget class="QWidget" name="dockWidgetContents"> <widget class="QWidget" name="dockWidgetContents">
<layout class="QGridLayout" name="gridLayout_3"> <layout class="QGridLayout" name="gridLayout_3">
<property name="margin">
<number>6</number>
</property>
<property name="spacing">
<number>5</number>
</property>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QScrollArea" name="scrollArea"> <widget class="QScrollArea" name="scrollArea">
<property name="widgetResizable"> <property name="widgetResizable">
@ -29,11 +35,23 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>598</width> <width>490</width>
<height>640</height> <height>437</height>
</rect> </rect>
</property> </property>
<layout class="QGridLayout" name="gridLayout_4"> <layout class="QGridLayout" name="gridLayout_4">
<property name="leftMargin">
<number>6</number>
</property>
<property name="rightMargin">
<number>6</number>
</property>
<property name="bottomMargin">
<number>6</number>
</property>
<property name="spacing">
<number>5</number>
</property>
<item row="0" column="0"> <item row="0" column="0">
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<property name="sizeConstraint"> <property name="sizeConstraint">
@ -68,6 +86,12 @@
<string>List edition</string> <string>List edition</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<property name="margin">
<number>6</number>
</property>
<property name="spacing">
<number>5</number>
</property>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QPushButton" name="addtPushButton"> <widget class="QPushButton" name="addtPushButton">
<property name="toolTip"> <property name="toolTip">
@ -157,6 +181,12 @@
<string>List Save/Load</string> <string>List Save/Load</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout_2"> <layout class="QGridLayout" name="gridLayout_2">
<property name="margin">
<number>6</number>
</property>
<property name="spacing">
<number>5</number>
</property>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QPushButton" name="loadVegetsetPushButton"> <widget class="QPushButton" name="loadVegetsetPushButton">
<property name="text"> <property name="text">
@ -198,6 +228,9 @@
</item> </item>
<item row="0" column="1"> <item row="0" column="1">
<widget class="QTabWidget" name="tabWidget"> <widget class="QTabWidget" name="tabWidget">
<property name="tabPosition">
<enum>QTabWidget::East</enum>
</property>
<property name="currentIndex"> <property name="currentIndex">
<number>0</number> <number>0</number>
</property> </property>

9
code/nel/tools/3d/object_viewer_qt/src/vegetable_landscape_form.ui
View file

@ -23,6 +23,9 @@
<string>Setup Wind</string> <string>Setup Wind</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout_3"> <layout class="QGridLayout" name="gridLayout_3">
<property name="spacing">
<number>5</number>
</property>
<item row="0" column="0"> <item row="0" column="0">
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QHBoxLayout" name="horizontalLayout">
<item> <item>
@ -184,6 +187,12 @@
<property name="enabled"> <property name="enabled">
<bool>false</bool> <bool>false</bool>
</property> </property>
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="tabPosition"> <property name="tabPosition">
<enum>QTabWidget::South</enum> <enum>QTabWidget::South</enum>
</property> </property>

10
code/nel/tools/3d/object_viewer_qt/src/vegetable_noise_value_form.ui
View file

@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>312</width> <width>245</width>
<height>110</height> <height>108</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@ -17,6 +17,12 @@
<string/> <string/>
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<property name="margin">
<number>6</number>
</property>
<property name="spacing">
<number>5</number>
</property>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="label_3"> <widget class="QLabel" name="label_3">
<property name="text"> <property name="text">

8
code/nel/tools/3d/object_viewer_qt/src/water_pool_form.ui
View file

@ -15,6 +15,12 @@
</property> </property>
<widget class="QWidget" name="dockWidgetContents"> <widget class="QWidget" name="dockWidgetContents">
<layout class="QGridLayout" name="gridLayout_2"> <layout class="QGridLayout" name="gridLayout_2">
<property name="margin">
<number>6</number>
</property>
<property name="spacing">
<number>5</number>
</property>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QSplitter" name="splitter"> <widget class="QSplitter" name="splitter">
<property name="orientation"> <property name="orientation">
@ -58,7 +64,7 @@
</item> </item>
</layout> </layout>
</widget> </widget>
<widget class="QWidget" name=""> <widget class="QWidget" name="layoutWidget">
<layout class="QVBoxLayout" name="verticalLayout_2"> <layout class="QVBoxLayout" name="verticalLayout_2">
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QHBoxLayout" name="horizontalLayout">

10
code/nel/tools/3d/object_viewer_qt/src/workspace_form.ui
View file

@ -6,14 +6,20 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>258</width> <width>240</width>
<height>246</height> <height>190</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Form</string> <string>Form</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<property name="spacing">
<number>0</number>
</property>
<property name="margin">
<number>0</number>
</property>
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_3"> <layout class="QHBoxLayout" name="horizontalLayout_3">
<item> <item>