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

Changed: #1193 Polished layout dialogs and code.

Browse source
This commit is contained in:
dnk-88 2011-02-24 15:12:16 +02:00
parent ef5c94d2fe
commit 05e294b3a2
4 changed files with 43 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
code/nel/tools/3d/object_viewer_qt/src/entity.cpp
View file

@ -25,9 +25,7 @@
// NeL includes
#include <nel/misc/path.h>
#include <nel/3d/u_driver.h>
#include <nel/3d/u_instance.h>
#include <nel/3d/u_scene.h>
#include <nel/3d/u_skeleton.h>
#include <nel/3d/u_animation_set.h>
#include <nel/3d/u_animation.h>
#include <nel/3d/u_play_list_manager.h>
@ -124,8 +122,10 @@ void CEntity::loadAnimation(std::string &fileName)
uint id = _AnimationSet->addAnimation(fileName.c_str(),CFile::getFilenameWithoutExtension(fileName).c_str());
_AnimationList.push_back(_AnimationSet->getAnimationName(id));
_AnimationSet->build();
if (!_Skeleton.empty()) _PlayList->registerTransform(_Skeleton);
else _PlayList->registerTransform(_Instance);
if (!_Skeleton.empty())
_PlayList->registerTransform(_Skeleton);
else
_PlayList->registerTransform(_Instance);
}
void CEntity::loadSWT(std::string &fileName)

2
code/nel/tools/3d/object_viewer_qt/src/object_viewer.h
View file

@ -39,9 +39,7 @@ namespace NL3D
class UDriver;
class UScene;
class ULight;
class UInstance;
class UCamera;
class USkeleton;
class UTextContext;
class UPlayListManager;
class U3dMouseListener;

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

@ -6,26 +6,26 @@
<rect>
<x>0</x>
<y>0</y>
<width>1101</width>
<height>121</height>
<width>1053</width>
<height>85</height>
</rect>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>950</width>
<height>121</height>
<width>896</width>
<height>85</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>524287</width>
<height>121</height>
<height>85</height>
</size>
</property>
<property name="windowTitle">
@ -39,8 +39,20 @@
</sizepolicy>
</property>
<layout class="QGridLayout" name="gridLayout_5">
<property name="leftMargin">
<number>6</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>6</number>
</property>
<property name="bottomMargin">
<number>9</number>
<number>0</number>
</property>
<property name="spacing">
<number>3</number>
</property>
<item row="0" column="0" rowspan="2">
<widget class="QToolButton" name="playToolButton">
@ -84,6 +96,9 @@
<property name="margin">
<number>0</number>
</property>
<property name="spacing">
<number>3</number>
</property>
<item row="0" column="0" rowspan="3">
<widget class="QFrame" name="frame_2">
<property name="frameShape">
@ -93,6 +108,12 @@
<enum>QFrame::Plain</enum>
</property>
<layout class="QGridLayout" name="gridLayout">
<property name="margin">
<number>0</number>
</property>
<property name="spacing">
<number>3</number>
</property>
<item row="0" column="0" rowspan="2">
<widget class="QStackedWidget" name="stackedWidget">
<property name="sizePolicy">
@ -102,12 +123,12 @@
</sizepolicy>
</property>
<property name="currentIndex">
<number>1</number>
<number>0</number>
</property>
<widget class="QWidget" name="pageGeneral">
<layout class="QGridLayout" name="gridLayout_2">
<property name="margin">
<number>9</number>
<number>0</number>
</property>
<property name="spacing">
<number>3</number>
@ -200,6 +221,9 @@
<property name="margin">
<number>0</number>
</property>
<property name="spacing">
<number>3</number>
</property>
<item row="0" column="0">
<widget class="QCheckBox" name="linkCheckBox">
<property name="enabled">

7
code/nel/tools/3d/object_viewer_qt/src/plugins/example/qnel_widget.cpp
View file

@ -84,6 +84,11 @@ void QNLWidget::setInterval(int msec)
m_mainTimer->setInterval(msec);
}
void QNLWidget::setBackgroundColor(NLMISC::CRGBA backgroundColor)
{
m_backgroundColor = backgroundColor;
}
void QNLWidget::updateRender()
{
if (isVisible())
@ -101,7 +106,7 @@ void QNLWidget::updateRender()
if (m_initialized && !m_driver->isLost())
{
//_driver->activate();
m_driver->clearBuffers(NLMISC::CRGBA(125,12,58));
m_driver->clearBuffers(m_backgroundColor);
Q_EMIT updatePreRender();
Q_EMIT updatePostRender();