merge

code/nel/include/nel/3d/index_buffer.h

@@ -736,7 +736,9 @@ inline void CIndexBuffer::lock (CIndexBufferReadWrite &accessor, uint first, uin
 		}
 	}
 	else
+	{
 		nlassert ((first==0)&&(last==0));
+	}
 
 	_LockCounter++;
 }
@@ -771,7 +773,9 @@ inline void CIndexBuffer::lock (CIndexBufferRead &accessor, uint first, uint las
 		}
 	}
 	else
+	{
 		nlassert ((first==0)&&(last==0));
+	}
 
 	_LockCounter++;
 }

code/nel/include/nel/3d/vertex_buffer.h

@@ -1177,7 +1177,9 @@ inline void CVertexBuffer::lock (CVertexBufferReadWrite &accessor, uint first, u
 		}
 	}
 	else
+	{
 		nlassert ((first==0)&&(last==0));
+	}
 
 	_LockCounter++;
 }
@@ -1212,7 +1214,9 @@ inline void CVertexBuffer::lock (CVertexBufferRead &accessor, uint first, uint l
 		}
 	}
 	else
+	{
 		nlassert ((first==0)&&(last==0));
+	}
 
 	_LockCounter++;
 }

code/nel/src/3d/font_generator.cpp

@@ -104,13 +104,13 @@ CFontGenerator::CFontGenerator (const std::string &fontFileName, const std::stri
 	}
 
 	string fontEx = fontExFileName;
-	if (fontEx == "")
+	if (fontEx.empty())
 	{
 		// try to see if the ex filename exists based on the fontExFileName
 		fontEx = CPath::lookup(CFile::getFilenameWithoutExtension (fontFileName)+".afm", false, false);
 	}
 
-	if (fontEx != "")
+	if (!fontEx.empty())
 	{
 		error = FT_Attach_File (_Face, fontEx.c_str ());
 		if (error)

code/nel/src/3d/texture_font.cpp

@@ -300,7 +300,7 @@ CTextureFont::SLetterInfo* CTextureFont::getLetterInfo (SLetterKey& k)
 	uint32 width, height;
 
 	//k.FontGenerator->getSizes (k.Char, k.Size, width, height);
-	// \todo mat : Temporaire !!! Essayer de faire intervenir le cache de freetype
+	// \todo mat : Temp !!! Try to use freetype cache
 	uint32 nPitch, nGlyphIndex;
 	sint32 nLeft, nTop, nAdvX;
 	k.FontGenerator->getBitmap (k.Char, k.Size, width, height, nPitch, nLeft, nTop,

code/nel/tools/3d/object_viewer_qt/src/plugins/example/CMakeLists.txt

@@ -23,6 +23,10 @@ ADD_LIBRARY(ovqt_plugin_example SHARED ${SRC} ${OVQT_PLUG_EXAMPLE_MOC_SRC} ${OVQ
 
 TARGET_LINK_LIBRARIES(ovqt_plugin_example nelmisc ${QT_LIBRARIES})
 
+IF(WITH_STLPORT)
+  TARGET_LINK_LIBRARIES(ovqt_plugin_example ${CMAKE_THREAD_LIBS_INIT})
+ENDIF(WITH_STLPORT)
+
 NL_DEFAULT_PROPS(ovqt_plugin_example "NeL, Tools, 3D: Object Viewer Qt Plugin: Example")
 NL_ADD_RUNTIME_FLAGS(ovqt_plugin_example)
 NL_ADD_LIB_SUFFIX(ovqt_plugin_example)

code/nel/tools/3d/object_viewer_qt/src/plugins/log/CMakeLists.txt

@@ -27,6 +27,10 @@ ADD_LIBRARY(ovqt_plugin_log SHARED ${SRC} ${OVQT_PLUG_LOG_MOC_SRC} ${OVQT_EXT_SY
 
 TARGET_LINK_LIBRARIES(ovqt_plugin_log nelmisc ${QT_LIBRARIES})
 
+IF(WITH_STLPORT)
+  TARGET_LINK_LIBRARIES(ovqt_plugin_log ${CMAKE_THREAD_LIBS_INIT})
+ENDIF(WITH_STLPORT)
+
 NL_DEFAULT_PROPS(ovqt_plugin_log "NeL, Tools, 3D: Object Viewer Qt Plugin: Log")
 NL_ADD_RUNTIME_FLAGS(ovqt_plugin_log)
 NL_ADD_LIB_SUFFIX(ovqt_plugin_log)

code/nel/tools/3d/object_viewer_qt/src/settings_dialog.cpp

@@ -80,10 +80,10 @@ CSettingsDialog::~CSettingsDialog()
 
 void CSettingsDialog::addPath()
 {
-	QListWidgetItem *newItem = new QListWidgetItem;
 	QString newPath = QFileDialog::getExistingDirectory(this);
-	if (!(newPath == ""))
+	if (!newPath.isEmpty())
 	{
+		QListWidgetItem *newItem = new QListWidgetItem;
 		newItem->setText(newPath);
 		newItem->setFlags(Qt::ItemIsEditable | Qt::ItemIsEnabled | Qt::ItemIsSelectable);
 		ui.pathsListWidget->addItem(newItem);

code/nel/tools/3d/object_viewer_widget/src/CMakeLists.txt

@@ -27,13 +27,17 @@ TARGET_LINK_LIBRARIES(object_viewer_widget_qt
 		${QT_LIBRARIES}
 		${QT_QTOPENGL_LIBRARY})
 
+IF(WITH_STLPORT)
+  TARGET_LINK_LIBRARIES(object_viewer_widget_qt ${CMAKE_THREAD_LIBS_INIT})
+ENDIF(WITH_STLPORT)
+
 ADD_DEFINITIONS(-DQT_NO_KEYWORDS ${LIBXML2_DEFINITIONS} ${QT_DEFINITIONS})
 ADD_DEFINITIONS(-DQT_PLUGIN)
 ADD_DEFINITIONS(-DQT_SHARED)
 #ADD_DEFINITIONS(-DQT_NO_DEBUG)
 
 NL_DEFAULT_PROPS(object_viewer_widget_qt "NeL, Tools, 3D: Object Viewer Qt Widget")
-#NL_ADD_RUNTIME_FLAGS(object_viewer_widget_qt)
+NL_ADD_RUNTIME_FLAGS(object_viewer_widget_qt)
 
 IF(WITH_PCH)
   ADD_NATIVE_PRECOMPILED_HEADER(object_viewer_widget_qt ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.h ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.cpp)

code/nel/tools/3d/object_viewer_widget/src/entity.cpp

@@ -1,19 +1,19 @@
 /*
-    Object Viewer Qt
+Object Viewer Qt Widget
-    Copyright (C) 2010 Dzmitry Kamiahin <dnk-88@tut.by>
+Copyright (C) 2010 Adrian Jaekel <aj at elane2k dot com>
 
-    This program is free software: you can redistribute it and/or modify
+This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
+it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
+the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
+(at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
+but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
+GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
+You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
@@ -40,10 +40,11 @@
 using namespace NLMISC;
 using namespace NL3D;
 
-namespace NLQT {
+namespace NLQT 
-
-CSlotInfo& CSlotInfo::operator=(const CSlotInfo & slotInfo)
 {
+
+	CSlotInfo& CSlotInfo::operator=(const CSlotInfo & slotInfo)
+	{
 		if ( this != &slotInfo)
 		{
 			Animation = slotInfo.Animation;
@@ -60,19 +61,19 @@ CSlotInfo& CSlotInfo::operator=(const CSlotInfo & slotInfo)
 			StartTime = slotInfo.StartTime;
 		}
 		return *this;
-}
+	}
 
-CEntity::CEntity(void):
+	CEntity::CEntity(void):
 	_Name("<Unknown>"), _FileNameShape(""),
 		_FileNameSkeleton(""), _inPlace(false), _incPos(false),
 		_Instance(NULL), _Skeleton(NULL), 
 		_PlayList(NULL), _AnimationSet(NULL)
-{
+	{
 		_CharacterScalePos = 1;
-}
+	}
 
-CEntity::~CEntity(void)
+	CEntity::~CEntity(void)
-{
+	{
 		if (_PlayList != NULL)
 		{
 			_PlayList->resetAllChannels();
@@ -95,83 +96,83 @@ CEntity::~CEntity(void)
 			CObjectViewerWidget::objViewWid().getScene()->deleteInstance(_Instance);
 			_Instance = NULL;
 		}
-}
+	}
 
-void CEntity::loadAnimation(std::string &fileName)
+	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);
-}
+	}
 
-void CEntity::loadSWT(std::string &fileName)
+	void CEntity::loadSWT(std::string &fileName)
-{
+	{
 		uint id = _AnimationSet->addSkeletonWeight(fileName.c_str(),CFile::getFilenameWithoutExtension(fileName).c_str());
 		_SWTList.push_back(_AnimationSet->getSkeletonWeightName(id));
-}
+	}
 
-void CEntity::addAnimToPlayList(std::string &name)
+	void CEntity::addAnimToPlayList(std::string &name)
-{
+	{
 		_PlayListAnimation.push_back(name);
 
 		_AnimationStatus.EndAnim = this->getPlayListLength();
 
 		_Instance.start();
-}
+	}
 
-void CEntity::removeAnimToPlayList(uint row)
+	void CEntity::removeAnimToPlayList(uint row)
-{
+	{
 		if (row < _PlayListAnimation.size())
 			_PlayListAnimation.erase(_PlayListAnimation.begin() + row);
 
 		_AnimationStatus.EndAnim = this->getPlayListLength();
-}
+	}
 
-void CEntity::swapAnimToPlayList(uint row1, uint row2)
+	void CEntity::swapAnimToPlayList(uint row1, uint row2)
-{
+	{
 		if ((row1 < _PlayListAnimation.size()) && (row2 < _PlayListAnimation.size()))
 			std::swap(_PlayListAnimation[row1], _PlayListAnimation[row2]);
-}
+	}
 
-void CEntity::playbackAnim(bool play)
+	void CEntity::playbackAnim(bool play)
-{
+	{
 		_AnimationStatus.PlayAnim = play;
 
 		if (play)
 			_Instance.start();
 		else
 			_Instance.freezeHRC();
-}
+	}
 
-void CEntity::reset()
+	void CEntity::reset()
-{
+	{
 		_PlayListAnimation.clear();
 		_AnimationList.clear();
 		_SWTList.clear();
 
 		_PlayList->resetAllChannels();
-}
+	}
 
-float CEntity::getPlayListLength()
+	float CEntity::getPlayListLength()
-{
+	{
 		// Accumul all the time
 		float time = 0;
 		for(size_t i = 0; i < _PlayListAnimation.size(); ++i)
 			time += getAnimLength(_PlayListAnimation[i]);
 		return time;
-}
+	}
 
-float CEntity::getAnimLength(std::string name)
+	float CEntity::getAnimLength(std::string name)
-{
+	{
 		uint id = _AnimationSet->getAnimationIdByName(name.c_str());
 		NL3D::UAnimation *anim = _AnimationSet->getAnimation(id);
 		return anim->getEndTime() - anim->getBeginTime();
-}
+	}
 
-void CEntity::update(NL3D::TAnimationTime time)
+	void CEntity::update(NL3D::TAnimationTime time)
-{
+	{
 		this->resetChannel();
 		switch (_AnimationStatus.Mode) 
 		{
@@ -182,18 +183,18 @@ void CEntity::update(NL3D::TAnimationTime time)
 			animateChannelMixer();
 			break;
 		}
-}
+	}
 
 
-void CEntity::resetChannel()
+	void CEntity::resetChannel()
-{
+	{
 		for(uint i = 0; i < NL3D::CChannelMixer::NumAnimationSlot; i++)
 			_PlayList->setAnimation(i, UPlayList::empty);
-}
+	}
 
-void CEntity::addTransformation (CMatrix &current, UAnimation *anim, float begin, float end, UTrack *posTrack, UTrack *rotquatTrack, 
+	void CEntity::addTransformation (CMatrix &current, UAnimation *anim, float begin, float end, UTrack *posTrack, UTrack *rotquatTrack, 
 		UTrack *nextPosTrack, UTrack *nextRotquatTrack, bool removeLast)
-{
+	{
 		// In place ?
 		if (_inPlace)
 		{
@@ -264,10 +265,10 @@ void CEntity::addTransformation (CMatrix &current, UAnimation *anim, float begin
 				current = tmp;
 			}
 		}
-}
+	}
 
-void CEntity::animatePlayList(NL3D::TAnimationTime time)
+	void CEntity::animatePlayList(NL3D::TAnimationTime time)
-{
+	{
 		if (!_PlayListAnimation.empty())
 		{
 			// Animation index
@@ -381,10 +382,10 @@ void CEntity::animatePlayList(NL3D::TAnimationTime time)
 				}
 			}
 		}
-}
+	}
 
-void CEntity::animateChannelMixer()
+	void CEntity::animateChannelMixer()
-{
+	{
 		for (uint i = 0; i < NL3D::CChannelMixer::NumAnimationSlot; i++)
 		{
 			if (_SlotInfo[i].Enable)
@@ -425,6 +426,6 @@ void CEntity::animateChannelMixer()
 				}
 			}
 		}
-}
+	}
 
 } /* namespace NLQT */

code/nel/tools/3d/object_viewer_widget/src/entity.h

@@ -1,19 +1,19 @@
 /*
-    Object Viewer Qt
+Object Viewer Qt Widget
-    Copyright (C) 2010 Dzmitry Kamiahin <dnk-88@tut.by>
+Copyright (C) 2010 Adrian Jaekel <aj at elane2k dot com>
 
-    This program is free software: you can redistribute it and/or modify
+This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
+it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
+the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
+(at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
+but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
+GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
+You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
@@ -36,16 +36,18 @@
 #include <nel/3d/u_skeleton.h>
 #include <nel/3d/channel_mixer.h>
 
-namespace NL3D {
+namespace NL3D 
+{
 	class UPlayList;
 	class UAnimationSet;
 }
 
-namespace NLQT {
+namespace NLQT 
-  
-class CSlotInfo
 {
-public:
+
+	class CSlotInfo
+	{
+	public:
 		CSlotInfo ():
 		  Animation("empty"), Skeleton("empty"),
 			  Offset(0), StartTime(0), EndTime(0),
@@ -69,19 +71,19 @@ public:
 		  bool			Enable;
 
 		  CSlotInfo &operator=(const CSlotInfo &);
-};
+	};
 
 
-/**
+	/**
-@class CEntity
+	@class CEntity
-@brief Class manage animated shape.
+	@brief Class manage animated shape.
-@details
+	@details
-Allows you to load animations for shape and skeleton weight. 
+	Allows you to load animations for shape and skeleton weight. 
-Contains a built-in playlist. Has management and playback Playlists or Mixer.
+	Contains a built-in playlist. Has management and playback Playlists or Mixer.
-*/
+	*/
-class CEntity
+	class CEntity
-{
+	{
-public:
+	public:
 		struct Mode
 		{
 			enum List
@@ -193,7 +195,7 @@ public:
 		/// Get game interface for manipulating Skeleton.
 		NL3D::USkeleton getSkeleton() const { return _Skeleton; }
 
-private:
+	private:
 		/// Constructor
 		CEntity(void);
 
@@ -249,10 +251,10 @@ private:
 		CSlotInfo			_SlotInfo[NL3D::CChannelMixer::NumAnimationSlot];
 
 		friend class CObjectViewerWidget;
-}; /* class CEntity */
+	}; /* class CEntity */
 
-typedef std::map<std::string, CEntity>	CEntities;
+	typedef std::map<std::string, CEntity>	CEntities;
-typedef CEntities::iterator		EIT;
+	typedef CEntities::iterator		EIT;
 
 } /* namespace NLQT */
 

code/nel/tools/3d/object_viewer_widget/src/interfaces.h

@@ -19,10 +19,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef INTERFACES_H
 #define INTERFACES_H
 
+#include "stdpch.h"
+#include "entity.h"
+
 #include <QtPlugin>
 
-namespace NL3D {
+namespace NL3D 
+{
 	class UPlayListManager;
+	class UDriver;
+	class UScene;
 }
 
 namespace NLQT 
@@ -65,6 +71,7 @@ namespace NLQT
 		virtual bool setupLight(const NLMISC::CVector &position, const NLMISC::CVector &direction) = 0;
 		virtual void setVisible(bool visible) = 0;
 		virtual QWidget* getWidget() = 0;
+		virtual void setNelContext(NLMISC::INelContext &nelContext) = 0;
 
 	};
 

code/nel/tools/3d/object_viewer_widget/src/object_viewer_widget.cpp

@@ -78,13 +78,20 @@ namespace NLQT
 
 	}
 
+	void CObjectViewerWidget::setNelContext(NLMISC::INelContext &nelContext) 
+	{
+		_LibContext = new CLibraryContext(nelContext);
+	}
+
 	void CObjectViewerWidget::init()
 	{
+
 		connect(this, SIGNAL(topLevelChanged(bool)),
 			this, SLOT(topLevelChanged(bool)));
 		//H_AUTO2
 		//nldebug("%d %d %d",_nlw->winId(), width(), height());
 
+
 #if defined(NL_OS_UNIX) && !defined(NL_OS_MAC)
 		//dynamic_cast<QNLWidget*>(widget())->makeCurrent();
 #endif // defined(NL_OS_UNIX) && !defined(NL_OS_MAC)
@@ -410,7 +417,6 @@ namespace NLQT
 		if ( _Entities.count(fileName) != 0) 
 			return false;
 
-		CPath::display();
 		CPath::addSearchPath(CFile::getPath(meshFileName), false, false);
 
 		// create instance of the mesh character

code/nel/tools/3d/object_viewer_widget/src/object_viewer_widget.h

@@ -63,12 +63,11 @@ namespace NLQT
 		CObjectViewerWidget(QWidget *parent = 0);
 		virtual ~CObjectViewerWidget();
 
+		void setNelContext(NLMISC::INelContext &nelContext);
+
 		static CObjectViewerWidget  &objViewWid() { return *_objectViewerWidget; }
 
 		/// Init a driver and create scene.
-		/// @param wnd - handle window.
-		/// @param w - width window.
-		/// @param h - height window.
 		void init();
 
 		/// Release class.
@@ -176,6 +175,8 @@ namespace NLQT
 
 		static CObjectViewerWidget  *_objectViewerWidget;
 
+		NLMISC::CLibraryContext *_LibContext;
+
 		// render stuff
 		QTimer *_mainTimer;
 		bool _isGraphicsInitialized, _isGraphicsEnabled;

code/nel/tools/3d/object_viewer_widget/src/stdpch.cpp

@@ -1,19 +1,19 @@
 /*
-    Georges Editor Qt
+Object Viewer Qt Widget
-	Copyright (C) 2010 Adrian Jaekel <aj at elane2k dot com>
+Copyright (C) 2010 Adrian Jaekel <aj at elane2k dot com>
 
-    This program is free software: you can redistribute it and/or modify
+This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
+it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
+the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
+(at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
+but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
+GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
+You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "stdpch.h"

code/nel/tools/3d/object_viewer_widget/src/stdpch.h

@@ -1,19 +1,19 @@
 /*
-    Object Viewer Qt
+Object Viewer Qt Widget
-    Copyright (C) 2010 Dzmitry Kamiahin <dnk-88@tut.by>
+Copyright (C) 2010 Adrian Jaekel <aj at elane2k dot com>
 
-    This program is free software: you can redistribute it and/or modify
+This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
+it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
+the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
+(at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
+but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
+GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
+You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 

code/ryzom/client/src/micro_life_manager.cpp

@@ -558,7 +558,7 @@ void CMicroLifeManager::tileAdded(const NL3D::CTileAddedInfo &infos)
 #if !FINAL_VERSION
 				// for debug display, tells that it was generated dynamically
 				newFX.FromIG = false;
-			#endif
+#endif
 			// spawn a primitive on the quad
 			float weight[3];
 			// compute weight values by computing some noise values around

code/ryzom/tools/leveldesign/georges_editor_qt/src/CMakeLists.txt

@@ -9,7 +9,7 @@ INCLUDE( ${QT_USE_FILE} )
 
 FILE(GLOB GEORGES_EDITOR_SRC *.cpp *.h)
 SET(GEORGES_EDITOR_HDR georges_dirtree_dialog.h georges_treeview_dialog.h main_window.h
-	objectviewer_dialog.h settings_dialog.h progress_dialog.h object_viewer_widget.h)
+	objectviewer_dialog.h settings_dialog.h progress_dialog.h)
 SET(GEORGES_EDITOR_UIS settings_form.ui objectviewer_form.ui log_form.ui georges_treeview_form.ui georges_dirtree_form.ui)
 SET(GEORGES_EDITOR_RCS georges_editor_qt.qrc)
 

code/ryzom/tools/leveldesign/georges_editor_qt/src/entity.cpp

@@ -76,23 +76,23 @@ CEntity::~CEntity(void)
 	if (_PlayList != NULL)
 	{
 		_PlayList->resetAllChannels();
-		//Modules::objViewWid().getPlayListManager()->deletePlayList (_PlayList);
+		Modules::objViewInt().getPlayListManager()->deletePlayList (_PlayList);
 		_PlayList = NULL;
 	}
 	if (_AnimationSet != NULL)
 	{
-		//Modules::objViewWid().getDriver()->deleteAnimationSet(_AnimationSet);
+		Modules::objViewInt().getDriver()->deleteAnimationSet(_AnimationSet);
 		_AnimationSet = NULL;
 	}
 	if (!_Skeleton.empty())
 	{
 		_Skeleton.detachSkeletonSon(_Instance);
-		//Modules::objViewWid().getScene()->deleteSkeleton(_Skeleton);
+		Modules::objViewInt().getScene()->deleteSkeleton(_Skeleton);
 		_Skeleton = NULL;
 	}
 	if (!_Instance.empty())
 	{
-		//Modules::objViewWid().getScene()->deleteInstance(_Instance);
+		Modules::objViewInt().getScene()->deleteInstance(_Instance);
 		_Instance = NULL;
 	}
 }

code/ryzom/tools/leveldesign/georges_editor_qt/src/modules.cpp

@@ -1,19 +1,19 @@
 /*
-    Georges Editor Qt
+Georges Editor Qt
-	Copyright (C) 2010 Adrian Jaekel <aj at elane2k dot com>
+Copyright (C) 2010 Adrian Jaekel <aj at elane2k dot com>
 
-    This program is free software: you can redistribute it and/or modify
+This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
+it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
+the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
+(at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
+but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
+GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
+You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "modules.h"
@@ -24,7 +24,6 @@
 #include <QString>
 
 NLQT::CConfiguration      *Modules::_configuration = NULL;
-NLQT::CObjectViewerWidget *Modules::_objectViewerWidget = NULL;
 NLQT::IObjectViewer       *Modules::_objViewerInterface = NULL;
 NLQT::CMainWindow         *Modules::_mainWindow = NULL;
 
@@ -32,24 +31,24 @@ void Modules::init()
 {
 	loadPlugin();
 
+	_objViewerInterface->setNelContext(NLMISC::INelContext::getInstance());
+
 	if (_configuration == NULL) _configuration = new NLQT::CConfiguration;
 	config().init();
 
-	if (_objectViewerWidget == NULL) _objectViewerWidget = new NLQT::CObjectViewerWidget;
 	if (_mainWindow == NULL) _mainWindow = new NLQT::CMainWindow;
 }
 
 void Modules::release()
 {
 	delete _mainWindow; _mainWindow = NULL;
-	//delete _objectViewerWidget; _objectViewerWidget = NULL;
 
 	config().release();
 	delete _configuration; _configuration = NULL;
 }
 
 bool Modules::loadPlugin()
- {
+{
 	QDir pluginsDir(qApp->applicationDirPath());
 	/*#if defined(Q_OS_WIN)
 	if (pluginsDir.dirName().toLower() == "debug" || pluginsDir.dirName().toLower() == "release")
@@ -65,7 +64,8 @@ bool Modules::loadPlugin()
 	//Q_FOREACH (QString fileName, pluginsDir.entryList(QDir::Files)) {
 	QPluginLoader pluginLoader(pluginsDir.absoluteFilePath("object_viewer_widget_qt.dll"));
 	QObject *plugin = pluginLoader.instance();
-         if (plugin) {
+	if (plugin) 
+	{
 		_objViewerInterface = qobject_cast<NLQT::IObjectViewer *>(plugin);
 		if (_objViewerInterface)
 			return true;
@@ -73,4 +73,4 @@ bool Modules::loadPlugin()
 	//}
 
 	return false;
- }
+}

code/ryzom/tools/leveldesign/georges_editor_qt/src/modules.h

@@ -20,10 +20,7 @@
 #define MODULES_H
 
 #include "configuration.h"
-//#include "object_viewer.h"
-#include "object_viewer_widget.h"
 #include "main_window.h"
-
 #include "interfaces.h"
 
 class Modules
@@ -34,18 +31,13 @@ public:
 	
 	static NLQT::CConfiguration &config()  { return *_configuration; }
 	static NLQT::IObjectViewer  &objViewInt() { return *_objViewerInterface; }
-	static NLQT::CObjectViewerWidget  &objViewWid() { return *_objectViewerWidget; }
-	//static NLQT::CGeorges       &georges() { return *_georges;}
 	static NLQT::CMainWindow    &mainWin() { return *_mainWindow; }
 private:
 	static bool loadPlugin();
-	static NLQT::IObjectViewer *_objViewerInterface;
 
+	static NLQT::IObjectViewer *_objViewerInterface;
 	static NLQT::CConfiguration *_configuration;
-	//static NLQT::CObjectViewer  *_objectViewer;
-	static NLQT::CObjectViewerWidget  *_objectViewerWidget;
 	static NLQT::CMainWindow    *_mainWindow;
-	//static NLQT::CGeorges       *_georges;
 };
 
 #endif // MODULES_H

code/ryzom/tools/leveldesign/georges_editor_qt/src/object_viewer.cpp

@@ -1,541 +0,0 @@
-/*
-Georges Editor Qt
-Copyright (C) 2010 Adrian Jaekel <aj at elane2k dot com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "object_viewer.h"
-
-// STL includes
-
-// NeL includes
-#include <nel/misc/common.h>
-#include <nel/misc/debug.h>
-#include <nel/misc/file.h>
-#include <nel/misc/bitmap.h>
-#include <nel/misc/path.h>
-#include <nel/3d/u_driver.h>
-#include <nel/3d/u_text_context.h>
-#include <nel/3d/u_scene.h>
-#include <nel/3d/u_light.h>
-#include <nel/3d/u_camera.h>
-#include <nel/3d/u_instance.h>
-#include <nel/3d/u_skeleton.h>
-#include <nel/3d/u_play_list.h>
-#include <nel/3d/u_animation_set.h>
-#include <nel/3d/u_animation.h>
-#include <nel/3d/u_play_list_manager.h>
-#include <nel/3d/u_3d_mouse_listener.h>
-#include <nel/3d/bloom_effect.h>
-
-//#include <nel/3d/event_mouse_listener.h>
-
-// Project includes
-#include "modules.h"
-#include "configuration.h"
-
-using namespace std;
-using namespace NLMISC;
-using namespace NL3D;
-
-namespace NLQT 
-{
-
-	CObjectViewer::CObjectViewer() 
-	: _Driver(NULL), _Light(0),
-	_phi(0), _psi(0),_dist(2),
-	_CameraFocal(75),
-	_CurrentInstance(""),
-	_BloomEffect(false), _Scene(0)
-	{
-
-	}
-
-	CObjectViewer::~CObjectViewer()
-	{
-
-	}
-
-	void CObjectViewer::reinit(nlWindow wnd, uint16 w, uint16 h)
-	{
-		nldebug("CObjectViewert::reinit");
-
-		//release();
-		//init(wnd, w, h);
-		//_Driver->setDisplay(wnd, NL3D::UDriver::CMode(w, h, 32));
-	}
-
-	void CObjectViewer::init(nlWindow wnd, uint16 w, uint16 h)
-	{
-		nldebug("CObjectViewer::init");
-
-		// set background color from config
-		NLMISC::CConfigFile::CVar v = Modules::config().getConfigFile().getVar("BackgroundColor");
-		_BackgroundColor = CRGBA(v.asInt(0), v.asInt(1), v.asInt(2));
-
-		// set graphics driver from config
-		NLMISC::CConfigFile::CVar v2 = Modules::config().getConfigFile().getVar("GraphicsDriver");
-		// Choose driver opengl to work correctly under Linux example
-		_Direct3D = false; //_Driver = OpenGL;
-
-#ifdef NL_OS_WINDOWS
-		std::string driver = v2.asString();
-		if (driver == "Direct3D") _Direct3D = true; //m_Driver = Direct3D;
-		else if (driver == "OpenGL") _Direct3D = false; //m_Driver = OpenGL;
-		else nlwarning("Invalid driver specified, defaulting to OpenGL");
-#endif
-
-		//Modules::config().setAndCallback("CameraFocal",CConfigCallback(this,&CObjectViewer::cfcbCameraFocal));
-		//Modules::config().setAndCallback("BloomEffect",CConfigCallback(this,&CObjectViewer::cfcbBloomEffect));
-
-		// create the driver
-		nlassert(!_Driver);
-
-		_Driver = UDriver::createDriver(0, _Direct3D, 0);
-		nlassert(_Driver);
-
-		// initialize the window with config file values
-		_Driver->setDisplay(wnd, NL3D::UDriver::CMode(w, h, 32));
-
-		//_Light = ULight::createLight();
-
-		//// set mode of the light
-		//_Light->setMode(ULight::DirectionalLight);
-
-		//// set position of the light
-		//_Light->setPosition(CVector(-20.f, 30.f, 10.f));
-
-		//// white light
-		//_Light->setAmbiant(CRGBA(255, 255, 255));
-
-		//// set and enable the light
-		//_Driver->setLight(0, *_Light);
-		//_Driver->enableLight(0);
-
-		// Create a scene
-		_Scene = _Driver->createScene(true);
-
-		_PlayListManager = _Scene->createPlayListManager();
-
-		//_Scene->enableLightingSystem(true);
-
-		// create the camera
-		UCamera camera = _Scene->getCam();
-
-		camera.setTransformMode (UTransformable::DirectMatrix);
-
-		setSizeViewport(w, h);
-
-		// camera will look at entities
-		camera.lookAt(NLMISC::CVector(_dist,0,1), NLMISC::CVector(0,0,0.5));
-
-		NLMISC::CVector hotSpot=NLMISC::CVector(0,0,0);
-
-		_MouseListener = _Driver->create3dMouseListener();
-		_MouseListener->setMatrix(_Scene->getCam().getMatrix());
-		_MouseListener->setFrustrum(_Scene->getCam().getFrustum());
-		_MouseListener->setHotSpot(hotSpot);
-		_MouseListener->setMouseMode(U3dMouseListener::edit3d);
-
-		NL3D::CBloomEffect::instance().setDriver(_Driver);
-		NL3D::CBloomEffect::instance().setScene(_Scene);
-		NL3D::CBloomEffect::instance().init(!_Direct3D);
-		//NL3D::CBloomEffect::instance().setDensityBloom(Modules::config().getConfigFile().getVar("BloomDensity").asInt());
-		//NL3D::CBloomEffect::instance().setSquareBloom(Modules::config().getConfigFile().getVar("BloomSquare").asBool());
-	}
-
-	void CObjectViewer::release()
-	{
-		//H_AUTO2
-		nldebug("");
-
-		_Driver->delete3dMouseListener(_MouseListener);
-
-		// delete all entities
-		deleteEntities();
-
-		_Scene->deletePlayListManager(_PlayListManager);
-
-		// delete the scene
-		_Driver->deleteScene(_Scene);
-
-		// delete the light
-		delete _Light;
-
-		// release driver
-		nlassert(_Driver);
-		_Driver->release();
-		delete _Driver;
-		_Driver = NULL;
-	}
-
-	void CObjectViewer::updateInput()
-	{
-		_Driver->EventServer.pump();
-
-		// New matrix from camera
-		_Scene->getCam().setTransformMode(NL3D::UTransformable::DirectMatrix);
-		_Scene->getCam().setMatrix (_MouseListener->getViewMatrix());
-
-		//nldebug("%s",_Scene->getCam().getMatrix().getPos().asString().c_str());
-	}
-
-	void CObjectViewer::renderDriver()
-	{
-		// Render the scene.
-		if((NL3D::CBloomEffect::instance().getDriver() != NULL) && (_BloomEffect))
-		{
-			NL3D::CBloomEffect::instance().initBloom();
-		}
-		_Driver->clearBuffers(_BackgroundColor);
-	}
-
-	void CObjectViewer::renderScene()
-	{
-		// render the scene
-		_Scene->render();
-
-		if((NL3D::CBloomEffect::instance().getDriver() != NULL) && (_BloomEffect))
-		{
-			NL3D::CBloomEffect::instance().endBloom();
-			NL3D::CBloomEffect::instance().endInterfacesDisplayBloom();
-		}
-	}
-
-	void CObjectViewer::renderDebug2D()
-	{
-	}
-
-	void CObjectViewer::saveScreenshot(const std::string &nameFile, bool jpg, bool png, bool tga)
-	{
-		//H_AUTO2
-
-		// FIXME: create screenshot path if it doesn't exist!
-
-		// empty bitmap
-		CBitmap bitmap;
-		// copy the driver buffer to the bitmap
-		_Driver->getBuffer(bitmap);
-		// create the file name
-		string filename = std::string("./") + nameFile;
-		// write the bitmap as a jpg, png or tga to the file
-		if (jpg)
-		{
-			string newfilename = CFile::findNewFile(filename + ".jpg");
-			COFile outputFile(newfilename);
-			bitmap.writeJPG(outputFile, 100);
-			nlinfo("Screenshot '%s' saved", newfilename.c_str());
-		}
-		if (png)
-		{
-			string newfilename = CFile::findNewFile(filename + ".png");
-			COFile outputFile(newfilename);
-			bitmap.writePNG(outputFile, 24);
-			nlinfo("Screenshot '%s' saved", newfilename.c_str());
-		}
-		if (tga)
-		{
-			string newfilename = CFile::findNewFile(filename + ".tga");
-			COFile outputFile(newfilename);
-			bitmap.writeTGA(outputFile, 24, false);
-			nlinfo("Screenshot '%s' saved", newfilename.c_str());
-		}
-	}
-
-	bool CObjectViewer::loadMesh(const std::string &meshFileName, const std::string &skelFileName)
-	{
-		std::string fileName = CFile::getFilenameWithoutExtension(meshFileName);
-		if ( _Entities.count(fileName) != 0) 
-			return false;
-
-		CPath::addSearchPath(CFile::getPath(meshFileName), false, false);
-
-		// create instance of the mesh character
-		UInstance Entity = _Scene->createInstance(meshFileName);
-		
-		CAABBox bbox;
-		Entity.getShapeAABBox(bbox);
-		setCamera(bbox , Entity, true);
-
-		_MouseListener->setMatrix(_Scene->getCam().getMatrix());
-
-		USkeleton Skeleton = _Scene->createSkeleton(skelFileName);
-
-		// if we can't create entity, skip it
-		if (Entity.empty()) return false;
-
-		// create a new entity
-		EIT eit = (_Entities.insert (make_pair (fileName, CEntity()))).first;
-		CEntity	&entity = (*eit).second;
-
-		// set the entity up
-		entity._Name = fileName;
-		entity._FileNameShape = meshFileName;
-		entity._FileNameSkeleton = skelFileName;
-		entity._Instance = Entity;
-		if (!Skeleton.empty()) 
-		{
-			entity._Skeleton = Skeleton;
-			entity._Skeleton.bindSkin (entity._Instance);
-		}
-		entity._AnimationSet = _Driver->createAnimationSet(false);
-		entity._PlayList = _PlayListManager->createPlayList(entity._AnimationSet);
-		return true;
-	}
-
-	void CObjectViewer::resetScene()
-	{
-		deleteEntities();
-
-		// Reset camera.
-		//..
-
-		// to load files with the same name but located in different directories
-		//CPath::clearMap();
-
-		// load and set search paths from config
-		//Modules::config().configSearchPaths();
-
-		_CurrentInstance = "";
-
-		nlinfo("Scene cleared");
-	}
-
-	void CObjectViewer::updateCamera(float deltaPsi, float deltaPhi, float deltaDist)
-	{
-		
-	}
-
-	void CObjectViewer::setBackgroundColor(NLMISC::CRGBA backgroundColor)
-	{
-		_BackgroundColor = backgroundColor;
-
-		// config file variable changes
-		Modules::config().getConfigFile().getVar("BackgroundColor").setAsInt(_BackgroundColor.R, 0);
-		Modules::config().getConfigFile().getVar("BackgroundColor").setAsInt(_BackgroundColor.G, 1);
-		Modules::config().getConfigFile().getVar("BackgroundColor").setAsInt(_BackgroundColor.B, 2);
-	}
-
-	void CObjectViewer::setGraphicsDriver(bool Direct3D)
-	{
-		_Direct3D = Direct3D;
-
-		if (_Direct3D) Modules::config().getConfigFile().getVar("GraphicsDriver").setAsString("Direct3D");
-		else Modules::config().getConfigFile().getVar("GraphicsDriver").setAsString("OpenGL");
-	}
-
-	void CObjectViewer::setSizeViewport(uint16 w, uint16 h)
-	{
-		_Scene->getCam().setPerspective(_CameraFocal * (float)Pi/180.f, (float)w/h, 0.1f, 1000);
-	}
-
-	void CObjectViewer::setCurrentObject(const std::string &name)
-	{
-		if ((_Entities.count(name) != 0) || ( name.empty() )) _CurrentInstance = name;
-		else nlerror ("Entity %s not found", name.c_str());
-		nlinfo("set current entity %s", _CurrentInstance.c_str());
-	}
-
-	CEntity& CObjectViewer::getEntity(const std::string &name)
-	{
-		if ( _Entities.count(name) == 0) nlerror("Entity %s not found", name.c_str());
-		EIT eit = _Entities.find (name);
-		return (*eit).second;
-	}
-
-	void CObjectViewer::getListObjects(std::vector<std::string> &listObj)
-	{
-		listObj.clear();
-		for (EIT eit = _Entities.begin(); eit != _Entities.end(); ++eit)
-			listObj.push_back((*eit).second._Name);
-	}
-
-	void CObjectViewer::deleteEntity(CEntity &entity)
-	{
-		if (entity._PlayList != NULL)
-		{
-			_PlayListManager->deletePlayList (entity._PlayList);
-			entity._PlayList = NULL;
-		}
-
-		if (entity._AnimationSet != NULL)
-		{
-			_Driver->deleteAnimationSet(entity._AnimationSet);
-			entity._AnimationSet = NULL;
-		}
-
-		if (!entity._Skeleton.empty())
-		{
-			entity._Skeleton.detachSkeletonSon(entity._Instance);
-
-			_Scene->deleteSkeleton(entity._Skeleton);
-			entity._Skeleton = NULL;
-		}
-
-		if (!entity._Instance.empty())
-		{
-			_Scene->deleteInstance(entity._Instance);
-			entity._Instance = NULL;
-		}
-	}
-
-	void CObjectViewer::deleteEntities()
-	{
-		for (EIT eit = _Entities.begin(); eit != _Entities.end(); ++eit)
-		{
-			CEntity	&entity = (*eit).second;
-			deleteEntity(entity);
-		}
-		_Entities.clear();
-	}
-
-	void CObjectViewer::setCamera(CAABBox &bbox, UTransform &entity, bool high_z)
-	{
-		CVector pos(0.f, 0.f, 0.f);
-		CQuat quat(0.f, 0.f, 0.f, 0.f);
-		NL3D::UInstance inst;
-		inst.cast(entity);
-		if (!inst.empty())
-		{
-			inst.getDefaultPos(pos);
-			inst.getDefaultRotQuat(quat);
-			/*
-			if (quat.getAxis().isNull())
-			{
-			quat.set(0, 0, 0, 0);
-			inst.setRotQuat(quat);
-			}
-			*/
-			//		quat.set(1.f, 1.f, 0.f, 0.f);
-
-			//		inst.setRotQuat(quat);
-			//		inst.getRotQuat(quat);
-
-			// check for presence of all textures from each sets
-			//bool allGood = true;
-
-			//for(uint s = 0; s < 5; ++s)
-			//{
-			//	inst.selectTextureSet(s);
-
-			//	uint numMat = inst.getNumMaterials();
-
-			//	// by default, all textures are present
-			//	allGood = true;
-
-			//	for(uint i = 0; i < numMat; ++i)
-			//	{
-			//		UInstanceMaterial mat = inst.getMaterial(i);
-
-			//		for(sint j = 0; j <= mat.getLastTextureStage(); ++j)
-			//		{
-			//			// if a texture is missing
-			//			if (mat.isTextureFile(j) && mat.getTextureFileName(j) == "CTextureMultiFile:Dummy")
-			//				allGood = false;
-			//		}
-			//	}
-
-			//	// if all textures have been found for this set, skip other sets
-			//	if (allGood)
-			//		break;
-			//}
-		}
-
-		// fix scale (some shapes have a different value)
-		entity.setScale(1.f, 1.f, 1.f);
-
-		UCamera Camera = _Scene->getCam();
-		CVector max_radius = bbox.getHalfSize();
-
-		CVector center = bbox.getCenter();
-		entity.setPivot(center);
-		center += pos;
-
-		//_Scene->getCam().setPerspective(_CameraFocal * (float)Pi/180.f, (float)w/h, 0.1f, 1000);
-		float fov = float(_CameraFocal * (float)Pi/180.0);
-		//Camera.setPerspective (fov, 1.0f, 0.1f, 1000.0f);
-		float radius = max(max(max_radius.x, max_radius.y), max_radius.z);
-		if (radius == 0.f) radius = 1.f;
-		float left, right, bottom, top, znear, zfar;
-		Camera.getFrustum(left, right, bottom, top, znear, zfar);
-		float dist = radius / (tan(fov/2));
-		CVector eye(center);
-		/*	if (axis == CVector::I)
-		eye.y -= dist+radius;
-		else if (axis == CVector::J)
-		eye.x += dist+radius;
-		*/
-		//	quat.normalize();
-
-		CVector ax(quat.getAxis());
-
-		//	float angle = quat.getAngle();
-		/*
-		if (ax.isNull())
-		{
-		if (int(angle*100.f) == int(NLMISC::Pi * 200.f))
-		{
-		ax = CVector::J;
-		}
-		}
-		else 
-		*/
-		if (ax.isNull() || ax == CVector::I)
-		{
-			ax = CVector::J;
-		}
-		else if (ax == -CVector::K)
-		{
-			ax = -CVector::J;
-		}
-		/*	else if (ax.x < -0.9f && ax.y == 0.f && ax.z == 0.f)
-		{
-		ax = -CVector::J ;
-		}
-		*/
-		//	ax.normalize();
-
-		eye -= ax * (dist+radius);
-		if (high_z)
-			eye.z += max_radius.z/1.0f;
-		Camera.lookAt(eye, center);
-		setupLight(eye, center - eye);
-	}
-
-	bool CObjectViewer::setupLight(const CVector &position, const CVector &direction)
-	{
-		if (!_Light)
-		_Light = ULight::createLight();
-		if (!_Light) return false;
-
-		// set mode of the light
-		_Light->setMode(ULight::DirectionalLight);
-
-		// set position of the light
-		//	Light->setupDirectional(settings.light_ambiant, settings.light_diffuse, settings.light_specular, settings.light_direction);
-		NLMISC::CRGBA light_ambiant = CRGBA(0,0,0);
-		NLMISC::CRGBA light_diffuse = CRGBA(255,255,255);
-		NLMISC::CRGBA light_specular = CRGBA(255,255,255);
-		NLMISC::CVector light_direction = CVector(0.25, 0.25, 0.25);
-		_Light->setupPointLight(light_ambiant, light_diffuse, light_specular, position, direction + light_direction);
-
-		// set and enable the light
-		_Driver->setLight(0, *_Light);
-		_Driver->enableLight(0);
-
-		return true;
-	}
-
-} /* namespace NLQT */

code/ryzom/tools/leveldesign/georges_editor_qt/src/object_viewer.h

@@ -1,198 +0,0 @@
-/*
-Georges Editor Qt
-Copyright (C) 2010 Adrian Jaekel <aj at elane2k dot com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef OBJECT_VIEWER_H
-#define OBJECT_VIEWER_H
-
-#include <nel/misc/types_nl.h>
-
-// STL includes
-#include <string>
-#include <map>
-
-// NeL includes
-#include <nel/misc/config_file.h>
-#include <nel/misc/rgba.h>
-#include <nel/3d/event_mouse_listener.h>
-#include <nel/misc/aabbox.h>
-
-// Project includes
-#include "entity.h"
-
-namespace NL3D 
-{
-	class UDriver;
-	class UScene;
-	class ULight;
-	class UInstance;
-	class UCamera;
-	class USkeleton;
-	class UPlayListManager;
-	class U3dMouseListener;
-}
-
-/**
-namespace NLQT
-@brief namespace NLQT
-*/
-namespace NLQT 
-{
-
-	/**
-	@class CObjectViewer
-	A CObjectViewer class loading and viewing shape, particle system files.
-	*/
-	class CObjectViewer
-	{
-	public:
-		/// Default constructor.
-		CObjectViewer();
-
-		virtual ~CObjectViewer();
-
-		/// Init a driver and create scene.
-		/// @param wnd - handle window.
-		/// @param w - width window.
-		/// @param h - height window.
-		void init(nlWindow wnd, uint16 w, uint16 h);
-
-		void reinit(nlWindow wnd, uint16 w, uint16 h);
-
-		/// Release class.
-		void release();
-
-		/// Update mouse and keyboard events. And update camera matrix.
-		void updateInput();
-
-		/// Render Driver (clear all buffers and set background color).
-		void renderDriver();
-
-		/// Render current scene.
-		void renderScene();
-
-		/// Render Debug 2D (stuff for dev).
-		void renderDebug2D();
-
-		/// Make a screenshot of the current scene and save.
-		void saveScreenshot(const std::string &nameFile, bool jpg, bool png, bool tga);
-
-		/// Load a mesh or particle system and add to current scene.
-		/// @param meshFileName - name loading shape or ps file.
-		/// @param skelFileName - name loading skeletin file.
-		/// @return true if file have been loaded, false if file have not been loaded.
-		bool loadMesh (const std::string &meshFileName, const std::string &skelFileName);
-
-		/// Reset current scene.
-		void resetScene();
-
-		/// Update the navigation camera.
-		/// @param deltaPsi - delta angle horizontal (radians).
-		/// @param deltaPhi - delta angle vertical (radians).
-		/// @param deltaDist - delta distance.
-		void updateCamera(float deltaPsi, float deltaPhi, float deltaDist);
-
-		/// Set the background color.
-		/// @param backgroundColor - background color.
-		void setBackgroundColor(NLMISC::CRGBA backgroundColor);
-
-		/// Set type driver.
-		/// @param Direct3D - type driver (true - Direct3D) or (false -OpenGL)
-		void setGraphicsDriver(bool Direct3D);
-
-		/// Set size viewport for correct set perspective
-		/// @param w - width window.
-		/// @param h - height window.
-		void setSizeViewport(uint16 w, uint16 h);
-		
-		void setBloomEffect(bool enabled) { _BloomEffect = enabled; }
-
-		/// Select instance from the scene
-		/// @param name - name instance,  "" if no instance edited
-		void setCurrentObject(const std::string &name);
-
-		/// Get current instance from the scene
-		/// @return name current instance, "" if no instance edited
-		const std::string& getCurrentObject() { return _CurrentInstance; }
-
-		/// Get entity from the scene
-		/// @return ref Entity
-		CEntity& getEntity(const std::string &name);
-
-		/// Get full list instances from the scene
-		/// @param listObj - ref of return list instances
-		void getListObjects(std::vector<std::string> &listObj);
-
-		/// Get value background color.
-		/// @return  background color.
-		NLMISC::CRGBA getBackgroundColor() { return _BackgroundColor; }
-
-		/// Get type driver.
-		/// @return true if have used Direct3D driver, false OpenGL driver.
-		inline bool getDirect3D() { return _Direct3D; }
-
-		inline bool getBloomEffect() const { return _BloomEffect; }
-
-		/// Get a pointer to the driver.
-		/// @return pointer to the driver.
-		inline NL3D::UDriver *getDriver() { return _Driver; }
-
-		/// Get a pointer to the scene.
-		/// @return pointer to the scene.
-		inline NL3D::UScene *getScene() { return _Scene; }
-
-		/// Get a manager of playlist
-		/// @return pointer to the UPlayListManager
-		inline NL3D::UPlayListManager *getPlayListManager() { return _PlayListManager; }
-
-		void setCamera(NLMISC::CAABBox &bbox, NL3D::UTransform &entity, bool high_z);
-		bool setupLight(const NLMISC::CVector &position, const NLMISC::CVector &direction);
-
-	private:
-		void deleteEntity (CEntity &entity);
-
-		/// Delete all entities
-		void deleteEntities();
-
-		NLMISC::CRGBA 			_BackgroundColor;
-
-		NL3D::UDriver 			*_Driver;
-		NL3D::UScene 			*_Scene;
-		NL3D::UPlayListManager  *_PlayListManager;
-		NL3D::ULight 			*_Light;
-		NL3D::UCamera 			*_Camera;
-		NL3D::U3dMouseListener  *_MouseListener;
-
-		// The entities storage
-		CEntities		_Entities;
-
-		/// Camera parameters.
-		float _phi, _psi, _dist;
-		float _CameraFocal;
-
-		bool _Direct3D;
-		bool _BloomEffect;
-
-		std::string _CurrentInstance;
-
-		// a temporary solution, and later remove
-		friend class CAnimationSetDialog;
-	};/* class CObjectViewer */
-
-} /* namespace NLQT */
-
-#endif // OBJECT_VIEWER_H

code/ryzom/tools/leveldesign/georges_editor_qt/src/object_viewer_widget.cpp

@@ -1,756 +0,0 @@
-/*
-Georges Editor Qt
-Copyright (C) 2010 Adrian Jaekel <aj at elane2k dot com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "object_viewer_widget.h"
-
-// STL includes
-
-// NeL includes
-#include <nel/misc/common.h>
-#include <nel/misc/debug.h>
-#include <nel/misc/file.h>
-#include <nel/misc/bitmap.h>
-#include <nel/misc/path.h>
-#include <nel/3d/u_driver.h>
-#include <nel/3d/driver_user.h>
-#include <nel/3d/u_text_context.h>
-#include <nel/3d/u_scene.h>
-#include <nel/3d/u_light.h>
-#include <nel/3d/u_camera.h>
-#include <nel/3d/u_instance.h>
-#include <nel/3d/u_skeleton.h>
-#include <nel/3d/u_play_list.h>
-#include <nel/3d/u_animation_set.h>
-#include <nel/3d/u_animation.h>
-#include <nel/3d/u_play_list_manager.h>
-#include <nel/3d/u_3d_mouse_listener.h>
-#include <nel/3d/bloom_effect.h>
-
-// Project includes
-#include "modules.h"
-
-using namespace NLMISC;
-using namespace NL3D;
-using namespace std;
-
-namespace NLQT 
-{
-
-	CObjectViewerWidget::CObjectViewerWidget(QWidget *parent)
-		: _isGraphicsInitialized(false), _isGraphicsEnabled(false), 
-		_Driver(NULL), _Light(0), _phi(0), _psi(0),_dist(2),
-		_CameraFocal(75), _CurrentInstance(""), _BloomEffect(false), 
-		_Scene(0), QWidget(parent) 
-	{
-		_isGraphicsEnabled = true;
-
-		// As a special case, a QTimer with a timeout of 0 will time out as soon as all the events in the window system's event queue have been processed. 
-		// This can be used to do heavy work while providing a snappy user interface.
-		_mainTimer = new QTimer(this);
-		connect(_mainTimer, SIGNAL(timeout()), this, SLOT(updateRender()));
-		// timer->start(); // <- timeout 0
-		// it's heavy on cpu, though, when no 3d driver initialized :)
-		_mainTimer->start(25); // 25fps
-	}
-
-	CObjectViewerWidget::~CObjectViewerWidget()
-	{
-
-	}
-
-	void CObjectViewerWidget::init()
-	{
-		connect(this, SIGNAL(topLevelChanged(bool)),
-			this, SLOT(topLevelChanged(bool)));
-		//H_AUTO2
-		//nldebug("%d %d %d",_nlw->winId(), width(), height());
-
-#if defined(NL_OS_UNIX) && !defined(NL_OS_MAC)
-		dynamic_cast<QNLWidget*>(widget())->makeCurrent();
-#endif // defined(NL_OS_UNIX) && !defined(NL_OS_MAC)
-
-		nlWindow wnd = winId();
-		uint16 w = width();
-		uint16 h = height();
-
-		setMouseTracking(true);
-
-		// set background color from config
-		NLMISC::CConfigFile::CVar v = Modules::config().getConfigFile().getVar("BackgroundColor");
-		_BackgroundColor = CRGBA(v.asInt(0), v.asInt(1), v.asInt(2));
-
-		// set graphics driver from config
-		NLMISC::CConfigFile::CVar v2 = Modules::config().getConfigFile().getVar("GraphicsDriver");
-		// Choose driver opengl to work correctly under Linux example
-		_Direct3D = false; //_Driver = OpenGL;
-
-#ifdef NL_OS_WINDOWS
-		std::string driver = v2.asString();
-		if (driver == "Direct3D") _Direct3D = true; //m_Driver = Direct3D;
-		else if (driver == "OpenGL") _Direct3D = false; //m_Driver = OpenGL;
-		else nlwarning("Invalid driver specified, defaulting to OpenGL");
-#endif
-
-		//Modules::config().setAndCallback("CameraFocal",CConfigCallback(this,&CObjectViewer::cfcbCameraFocal));
-		//Modules::config().setAndCallback("BloomEffect",CConfigCallback(this,&CObjectViewer::cfcbBloomEffect));
-
-		// create the driver
-		nlassert(!_Driver);
-
-		_Driver = UDriver::createDriver(0, _Direct3D, 0);
-		nlassert(_Driver);
-
-		// initialize the window with config file values
-		_Driver->setDisplay(wnd, NL3D::UDriver::CMode(w, h, 32));
-
-		//_Light = ULight::createLight();
-
-		//// set mode of the light
-		//_Light->setMode(ULight::DirectionalLight);
-
-		//// set position of the light
-		//_Light->setPosition(CVector(-20.f, 30.f, 10.f));
-
-		//// white light
-		//_Light->setAmbiant(CRGBA(255, 255, 255));
-
-		//// set and enable the light
-		//_Driver->setLight(0, *_Light);
-		//_Driver->enableLight(0);
-
-		// Create a scene
-		_Scene = _Driver->createScene(true);
-
-		_PlayListManager = _Scene->createPlayListManager();
-
-		//_Scene->enableLightingSystem(true);
-
-		// create the camera
-		UCamera camera = _Scene->getCam();
-
-		camera.setTransformMode (UTransformable::DirectMatrix);
-
-		setSizeViewport(w, h);
-
-		// camera will look at entities
-		camera.lookAt(NLMISC::CVector(_dist,0,1), NLMISC::CVector(0,0,0.5));
-
-		NLMISC::CVector hotSpot=NLMISC::CVector(0,0,0);
-
-		_MouseListener = _Driver->create3dMouseListener();
-		_MouseListener->setMatrix(_Scene->getCam().getMatrix());
-		_MouseListener->setFrustrum(_Scene->getCam().getFrustum());
-		_MouseListener->setHotSpot(hotSpot);
-		_MouseListener->setMouseMode(U3dMouseListener::edit3d);
-
-		NL3D::CBloomEffect::instance().setDriver(_Driver);
-		NL3D::CBloomEffect::instance().setScene(_Scene);
-		NL3D::CBloomEffect::instance().init(!_Direct3D);
-		//NL3D::CBloomEffect::instance().setDensityBloom(Modules::config().getConfigFile().getVar("BloomDensity").asInt());
-		//NL3D::CBloomEffect::instance().setSquareBloom(Modules::config().getConfigFile().getVar("BloomSquare").asBool());
-	}
-
-	void CObjectViewerWidget::release()
-	{
-		//H_AUTO2
-		nldebug("");
-
-		_Driver->delete3dMouseListener(_MouseListener);
-
-		// delete all entities
-		deleteEntities();
-
-		_Scene->deletePlayListManager(_PlayListManager);
-
-		// delete the scene
-		_Driver->deleteScene(_Scene);
-
-		// delete the light
-		delete _Light;
-
-		// release driver
-		nlassert(_Driver);
-		_Driver->release();
-		delete _Driver;
-		_Driver = NULL;
-	}
-
-	void CObjectViewerWidget::updateRender()
-	{
-		//nldebug("CMainWindow::updateRender");
-		updateInitialization(isVisible());
-
-		//QModelIndex index = _dirModel->setRootPath("D:/Dev/Ryzom/code/ryzom/common/data_leveldesign/leveldesign");
-		//_dirTree->setRootIndex(index);
-
-		if (isVisible())
-		{
-			// call all update functions
-			// 01. Update Utilities (configuration etc)
-
-			// 02. Update Time (deltas)
-			// ...
-
-			// 03. Update Receive (network, servertime, receive messages)
-			// ...
-
-			// 04. Update Input (keyboard controls, etc)
-			if (_isGraphicsInitialized)
-				updateInput();
-
-			// 05. Update Weather (sky, snow, wind, fog, sun)
-			// ...
-
-			// 06. Update Entities (movement, do after possible tp from incoming messages etc)
-			//      - Move other entities
-			//      - Update self entity
-			//      - Move bullets
-			// ...
-
-			// 07. Update Landscape (async zone loading near entity)
-			// ...
-
-			// 08. Update Collisions (entities)
-			//      - Update entities
-			//      - Update move container (swap with Update entities? todo: check code!)
-			//      - Update bullets
-			// ...
-
-			// 09. Update Animations (playlists)
-			//      - Needs to be either before or after entities, not sure, 
-			//        there was a problem with wrong order a while ago!!!
-
-
-			//updateAnimation(_AnimationDialog->getTime());
-
-			// 10. Update Camera (depends on entities)
-			// ...
-
-			// 11. Update Interface (login, ui, etc)
-			// ...
-
-			// 12. Update Sound (sound driver)
-			// ...
-
-			// 13. Update Send (network, send new position etc)
-			// ...
-
-			// 14. Update Debug (stuff for dev)
-			// ...
-
-			if (_isGraphicsInitialized && !getDriver()->isLost())
-			{
-				// 01. Render Driver (background color)			
-				renderDriver(); // clear all buffers
-
-				// 02. Render Sky (sky scene)
-				// ...
-
-				// 04. Render Scene (entity scene)
-				renderScene();
-
-				// 05. Render Effects (flare)
-				// ...
-
-				// 06. Render Interface 3D (player names)
-				// ...
-
-				// 07. Render Debug 3D
-				// ...
-
-				// 08. Render Interface 2D (chatboxes etc, optionally does have 3d)
-				// ...
-
-				// 09. Render Debug 2D (stuff for dev)
-				renderDebug2D();
-
-				// swap 3d buffers
-				getDriver()->swapBuffers();
-			}
-		}
-	}
-
-	void CObjectViewerWidget::updateInitialization(bool visible)
-	{
-		//nldebug("CMainWindow::updateInitialization");
-		bool done;
-		do
-		{
-			done = true; // set false whenever change
-			bool wantGraphics = _isGraphicsEnabled && visible;
-			// bool wantLandscape = wantGraphics && m_IsGraphicsInitialized && isLandscapeEnabled;
-
-			// .. stuff that depends on other stuff goes on top to prioritize deinitialization
-
-			// Landscape
-			// ...
-
-			// Graphics (Driver)
-			if (_isGraphicsInitialized)
-			{
-				if (!wantGraphics)
-				{
-					//_isGraphicsInitialized = false;
-					//release();
-					_mainTimer->stop();
-					//done = false;
-				}
-			}
-			else
-			{
-				if (wantGraphics)
-				{
-					init();
-					_isGraphicsInitialized = true;
-					_mainTimer->start(25);
-					//done = false;
-				}
-			}
-		}
-		while (!done);
-	}
-
-	void CObjectViewerWidget::updateInput()
-	{
-		_Driver->EventServer.pump();
-
-		// New matrix from camera
-		_Scene->getCam().setTransformMode(NL3D::UTransformable::DirectMatrix);
-		_Scene->getCam().setMatrix (_MouseListener->getViewMatrix());
-
-		//nldebug("%s",_Scene->getCam().getMatrix().getPos().asString().c_str());
-	}
-
-	void CObjectViewerWidget::renderDriver()
-	{
-		// Render the scene.
-		if((NL3D::CBloomEffect::instance().getDriver() != NULL) && (_BloomEffect))
-		{
-			NL3D::CBloomEffect::instance().initBloom();
-		}
-		_Driver->clearBuffers(_BackgroundColor);
-	}
-
-	void CObjectViewerWidget::renderScene()
-	{
-		// render the scene
-		_Scene->render();
-
-		if((NL3D::CBloomEffect::instance().getDriver() != NULL) && (_BloomEffect))
-		{
-			NL3D::CBloomEffect::instance().endBloom();
-			NL3D::CBloomEffect::instance().endInterfacesDisplayBloom();
-		}
-	}
-
-	void CObjectViewerWidget::renderDebug2D()
-	{
-	}
-
-	void CObjectViewerWidget::saveScreenshot(const std::string &nameFile, bool jpg, bool png, bool tga)
-	{
-		//H_AUTO2
-
-		// FIXME: create screenshot path if it doesn't exist!
-
-		// empty bitmap
-		CBitmap bitmap;
-		// copy the driver buffer to the bitmap
-		_Driver->getBuffer(bitmap);
-		// create the file name
-		string filename = std::string("./") + nameFile;
-		// write the bitmap as a jpg, png or tga to the file
-		if (jpg)
-		{
-			string newfilename = CFile::findNewFile(filename + ".jpg");
-			COFile outputFile(newfilename);
-			bitmap.writeJPG(outputFile, 100);
-			nlinfo("Screenshot '%s' saved", newfilename.c_str());
-		}
-		if (png)
-		{
-			string newfilename = CFile::findNewFile(filename + ".png");
-			COFile outputFile(newfilename);
-			bitmap.writePNG(outputFile, 24);
-			nlinfo("Screenshot '%s' saved", newfilename.c_str());
-		}
-		if (tga)
-		{
-			string newfilename = CFile::findNewFile(filename + ".tga");
-			COFile outputFile(newfilename);
-			bitmap.writeTGA(outputFile, 24, false);
-			nlinfo("Screenshot '%s' saved", newfilename.c_str());
-		}
-	}
-
-	bool CObjectViewerWidget::loadMesh(const std::string &meshFileName, const std::string &skelFileName)
-	{
-		std::string fileName = CFile::getFilenameWithoutExtension(meshFileName);
-		if ( _Entities.count(fileName) != 0) 
-			return false;
-
-		CPath::addSearchPath(CFile::getPath(meshFileName), false, false);
-
-		// create instance of the mesh character
-		UInstance Entity = _Scene->createInstance(meshFileName);
-		
-		CAABBox bbox;
-		Entity.getShapeAABBox(bbox);
-		setCamera(bbox , Entity, true);
-
-		_MouseListener->setMatrix(_Scene->getCam().getMatrix());
-
-		USkeleton Skeleton = _Scene->createSkeleton(skelFileName);
-
-		// if we can't create entity, skip it
-		if (Entity.empty()) return false;
-
-		// create a new entity
-		EIT eit = (_Entities.insert (make_pair (fileName, CEntity()))).first;
-		CEntity	&entity = (*eit).second;
-
-		// set the entity up
-		entity._Name = fileName;
-		entity._FileNameShape = meshFileName;
-		entity._FileNameSkeleton = skelFileName;
-		entity._Instance = Entity;
-		if (!Skeleton.empty()) 
-		{
-			entity._Skeleton = Skeleton;
-			entity._Skeleton.bindSkin (entity._Instance);
-		}
-		entity._AnimationSet = _Driver->createAnimationSet(false);
-		entity._PlayList = _PlayListManager->createPlayList(entity._AnimationSet);
-		return true;
-	}
-
-	void CObjectViewerWidget::setVisible(bool visible)
-	{
-		// called by show()
-		// code assuming visible window needed to init the 3d driver
-		nldebug("%d", visible);
-		if (visible)
-		{
-			QWidget::setVisible(true);
-		}
-		else
-		{
-			QWidget::setVisible(false);
-		}
-	}
-
-	void CObjectViewerWidget::resetScene()
-	{
-		deleteEntities();
-
-		// Reset camera.
-		//..
-
-		// to load files with the same name but located in different directories
-		//CPath::clearMap();
-
-		// load and set search paths from config
-		//Modules::config().configSearchPaths();
-
-		_CurrentInstance = "";
-
-		nlinfo("Scene cleared");
-	}
-
-	void CObjectViewerWidget::setBackgroundColor(NLMISC::CRGBA backgroundColor)
-	{
-		_BackgroundColor = backgroundColor;
-
-		// config file variable changes
-		Modules::config().getConfigFile().getVar("BackgroundColor").setAsInt(_BackgroundColor.R, 0);
-		Modules::config().getConfigFile().getVar("BackgroundColor").setAsInt(_BackgroundColor.G, 1);
-		Modules::config().getConfigFile().getVar("BackgroundColor").setAsInt(_BackgroundColor.B, 2);
-	}
-
-	void CObjectViewerWidget::setGraphicsDriver(bool Direct3D)
-	{
-		_Direct3D = Direct3D;
-
-		if (_Direct3D) Modules::config().getConfigFile().getVar("GraphicsDriver").setAsString("Direct3D");
-		else Modules::config().getConfigFile().getVar("GraphicsDriver").setAsString("OpenGL");
-	}
-
-	void CObjectViewerWidget::setSizeViewport(uint16 w, uint16 h)
-	{
-		_Scene->getCam().setPerspective(_CameraFocal * (float)Pi/180.f, (float)w/h, 0.1f, 1000);
-	}
-
-	void CObjectViewerWidget::setCurrentObject(const std::string &name)
-	{
-		if ((_Entities.count(name) != 0) || ( name.empty() )) _CurrentInstance = name;
-		else nlerror ("Entity %s not found", name.c_str());
-		nlinfo("set current entity %s", _CurrentInstance.c_str());
-	}
-
-	CEntity& CObjectViewerWidget::getEntity(const std::string &name)
-	{
-		if ( _Entities.count(name) == 0) nlerror("Entity %s not found", name.c_str());
-		EIT eit = _Entities.find (name);
-		return (*eit).second;
-	}
-
-	void CObjectViewerWidget::getListObjects(std::vector<std::string> &listObj)
-	{
-		listObj.clear();
-		for (EIT eit = _Entities.begin(); eit != _Entities.end(); ++eit)
-			listObj.push_back((*eit).second._Name);
-	}
-
-	void CObjectViewerWidget::deleteEntity(CEntity &entity)
-	{
-		if (entity._PlayList != NULL)
-		{
-			_PlayListManager->deletePlayList (entity._PlayList);
-			entity._PlayList = NULL;
-		}
-
-		if (entity._AnimationSet != NULL)
-		{
-			_Driver->deleteAnimationSet(entity._AnimationSet);
-			entity._AnimationSet = NULL;
-		}
-
-		if (!entity._Skeleton.empty())
-		{
-			entity._Skeleton.detachSkeletonSon(entity._Instance);
-
-			_Scene->deleteSkeleton(entity._Skeleton);
-			entity._Skeleton = NULL;
-		}
-
-		if (!entity._Instance.empty())
-		{
-			_Scene->deleteInstance(entity._Instance);
-			entity._Instance = NULL;
-		}
-	}
-
-	void CObjectViewerWidget::deleteEntities()
-	{
-		for (EIT eit = _Entities.begin(); eit != _Entities.end(); ++eit)
-		{
-			CEntity	&entity = (*eit).second;
-			deleteEntity(entity);
-		}
-		_Entities.clear();
-	}
-
-	void CObjectViewerWidget::setCamera(CAABBox &bbox, UTransform &entity, bool high_z)
-	{
-		CVector pos(0.f, 0.f, 0.f);
-		CQuat quat(0.f, 0.f, 0.f, 0.f);
-		NL3D::UInstance inst;
-		inst.cast(entity);
-		if (!inst.empty())
-		{
-			inst.getDefaultPos(pos);
-			inst.getDefaultRotQuat(quat);
-			/*
-			if (quat.getAxis().isNull())
-			{
-			quat.set(0, 0, 0, 0);
-			inst.setRotQuat(quat);
-			}
-			*/
-			//		quat.set(1.f, 1.f, 0.f, 0.f);
-
-			//		inst.setRotQuat(quat);
-			//		inst.getRotQuat(quat);
-
-			// check for presence of all textures from each sets
-			//bool allGood = true;
-
-			//for(uint s = 0; s < 5; ++s)
-			//{
-			//	inst.selectTextureSet(s);
-
-			//	uint numMat = inst.getNumMaterials();
-
-			//	// by default, all textures are present
-			//	allGood = true;
-
-			//	for(uint i = 0; i < numMat; ++i)
-			//	{
-			//		UInstanceMaterial mat = inst.getMaterial(i);
-
-			//		for(sint j = 0; j <= mat.getLastTextureStage(); ++j)
-			//		{
-			//			// if a texture is missing
-			//			if (mat.isTextureFile(j) && mat.getTextureFileName(j) == "CTextureMultiFile:Dummy")
-			//				allGood = false;
-			//		}
-			//	}
-
-			//	// if all textures have been found for this set, skip other sets
-			//	if (allGood)
-			//		break;
-			//}
-		}
-
-		// fix scale (some shapes have a different value)
-		entity.setScale(1.f, 1.f, 1.f);
-
-		UCamera Camera = _Scene->getCam();
-		CVector max_radius = bbox.getHalfSize();
-
-		CVector center = bbox.getCenter();
-		entity.setPivot(center);
-		center += pos;
-
-		//_Scene->getCam().setPerspective(_CameraFocal * (float)Pi/180.f, (float)w/h, 0.1f, 1000);
-		float fov = float(_CameraFocal * (float)Pi/180.0);
-		//Camera.setPerspective (fov, 1.0f, 0.1f, 1000.0f);
-		float radius = max(max(max_radius.x, max_radius.y), max_radius.z);
-		if (radius == 0.f) radius = 1.f;
-		float left, right, bottom, top, znear, zfar;
-		Camera.getFrustum(left, right, bottom, top, znear, zfar);
-		float dist = radius / (tan(fov/2));
-		CVector eye(center);
-		/*	if (axis == CVector::I)
-		eye.y -= dist+radius;
-		else if (axis == CVector::J)
-		eye.x += dist+radius;
-		*/
-		//	quat.normalize();
-
-		CVector ax(quat.getAxis());
-
-		//	float angle = quat.getAngle();
-		/*
-		if (ax.isNull())
-		{
-		if (int(angle*100.f) == int(NLMISC::Pi * 200.f))
-		{
-		ax = CVector::J;
-		}
-		}
-		else 
-		*/
-		if (ax.isNull() || ax == CVector::I)
-		{
-			ax = CVector::J;
-		}
-		else if (ax == -CVector::K)
-		{
-			ax = -CVector::J;
-		}
-		/*	else if (ax.x < -0.9f && ax.y == 0.f && ax.z == 0.f)
-		{
-		ax = -CVector::J ;
-		}
-		*/
-		//	ax.normalize();
-
-		eye -= ax * (dist+radius);
-		if (high_z)
-			eye.z += max_radius.z/1.0f;
-		Camera.lookAt(eye, center);
-		setupLight(eye, center - eye);
-	}
-
-	bool CObjectViewerWidget::setupLight(const CVector &position, const CVector &direction)
-	{
-		if (!_Light)
-		_Light = ULight::createLight();
-		if (!_Light) return false;
-
-		// set mode of the light
-		_Light->setMode(ULight::DirectionalLight);
-
-		// set position of the light
-		//	Light->setupDirectional(settings.light_ambiant, settings.light_diffuse, settings.light_specular, settings.light_direction);
-		NLMISC::CRGBA light_ambiant = CRGBA(0,0,0);
-		NLMISC::CRGBA light_diffuse = CRGBA(255,255,255);
-		NLMISC::CRGBA light_specular = CRGBA(255,255,255);
-		NLMISC::CVector light_direction = CVector(0.25, 0.25, 0.25);
-		_Light->setupPointLight(light_ambiant, light_diffuse, light_specular, position, direction + light_direction);
-
-		// set and enable the light
-		_Driver->setLight(0, *_Light);
-		_Driver->enableLight(0);
-
-		return true;
-	}
-
-#if defined(NL_OS_WINDOWS)
-
-	typedef bool (*winProc)(NL3D::IDriver *driver, HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam);
-
-	bool CObjectViewerWidget::winEvent(MSG * message, long * result)
-	{
-		if (getDriver() && getDriver()->isActive())
-		{
-			NL3D::IDriver *driver = dynamic_cast<NL3D::CDriverUser*>(getDriver())->getDriver();
-			if (driver)
-			{
-				winProc proc = (winProc)driver->getWindowProc();
-				return proc(driver, message->hwnd, message->message, message->wParam, message->lParam);
-			}
-		}
-
-		return false;
-	}
-
-#elif defined(NL_OS_MAC)
-
-	typedef bool (*cocoaProc)(NL3D::IDriver*, const void* e);
-
-	bool CObjectViewerWidget::macEvent(EventHandlerCallRef caller, EventRef event)
-	{
-		if(caller)
-			nlerror("You are using QtCarbon! Only QtCocoa supported, please upgrade Qt");
-
-		if (getDriver() && getDriver()->isActive())
-		{
-			NL3D::IDriver *driver = dynamic_cast<NL3D::CDriverUser*>(getDriver())->getDriver();
-			if (driver)
-			{
-				cocoaProc proc = (cocoaProc)driver->getWindowProc();
-				return proc(driver, event);
-			}
-		}
-
-		return false;
-	}
-
-#elif defined(NL_OS_UNIX)
-
-	typedef bool (*x11Proc)(NL3D::IDriver *drv, XEvent *e);
-
-	bool CObjectViewerWidget::x11Event(XEvent *event)
-	{
-		if (getDriver() && getDriver()->isActive())
-		{
-			NL3D::IDriver *driver = dynamic_cast<NL3D::CDriverUser*>(getDriver())->getDriver();
-			if (driver)
-			{
-				x11Proc proc = (x11Proc)driver->getWindowProc();
-				return proc(driver, event);
-			}
-		}
-
-		return false;
-	}
-#endif
-
-} /* namespace NLQT */

code/ryzom/tools/leveldesign/georges_editor_qt/src/object_viewer_widget.h

@@ -1,211 +0,0 @@
-/*
-Georges Editor Qt
-Copyright (C) 2010 Adrian Jaekel <aj at elane2k dot com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef OBJECT_VIEWER_WIDGET_H
-#define OBJECT_VIEWER_WIDGET_H
-
-// STL includes
-
-// Qt includes
-#include <QtOpenGL/QGLWidget>
-#include <QTimer>
-
-// NeL includes
-#include <nel/misc/rgba.h>
-#include <nel/misc/aabbox.h>
-
-// Project includes
-#include "entity.h"
-
-namespace NL3D 
-{
-	class UDriver;
-	class UScene;
-	class ULight;
-	class UInstance;
-	class UCamera;
-	class USkeleton;
-	class UPlayListManager;
-	class U3dMouseListener;
-}
-
-/**
-namespace NLQT
-@brief namespace NLQT
-*/
-namespace NLQT 
-{
-	class CObjectViewerWidget: public QWidget
-	{
-		Q_OBJECT
-
-	public:
-		/// Default constructor.
-		CObjectViewerWidget(QWidget *parent = 0);
-		virtual ~CObjectViewerWidget();
-
-		/// Init a driver and create scene.
-		/// @param wnd - handle window.
-		/// @param w - width window.
-		/// @param h - height window.
-		void init();
-
-		/// Release class.
-		void release();
-
-		/// Update mouse and keyboard events. And update camera matrix.
-		void updateInput();
-
-		/// Render Driver (clear all buffers and set background color).
-		void renderDriver();
-
-		/// Render current scene.
-		void renderScene();
-
-		/// Render Debug 2D (stuff for dev).
-		void renderDebug2D();
-
-		/// Make a screenshot of the current scene and save.
-		void saveScreenshot(const std::string &nameFile, bool jpg, bool png, bool tga);
-
-		/// Load a mesh or particle system and add to current scene.
-		/// @param meshFileName - name loading shape or ps file.
-		/// @param skelFileName - name loading skeletin file.
-		/// @return true if file have been loaded, false if file have not been loaded.
-		bool loadMesh (const std::string &meshFileName, const std::string &skelFileName);
-
-		/// Reset current scene.
-		void resetScene();
-
-		/// Update the navigation camera.
-		/// @param deltaPsi - delta angle horizontal (radians).
-		/// @param deltaPhi - delta angle vertical (radians).
-		/// @param deltaDist - delta distance.
-		void updateCamera(float deltaPsi, float deltaPhi, float deltaDist);
-
-		/// Set the background color.
-		/// @param backgroundColor - background color.
-		void setBackgroundColor(NLMISC::CRGBA backgroundColor);
-
-		/// Set type driver.
-		/// @param Direct3D - type driver (true - Direct3D) or (false -OpenGL)
-		void setGraphicsDriver(bool Direct3D);
-
-		/// Set size viewport for correct set perspective
-		/// @param w - width window.
-		/// @param h - height window.
-		void setSizeViewport(uint16 w, uint16 h);
-		
-		void setBloomEffect(bool enabled) { _BloomEffect = enabled; }
-
-		/// Select instance from the scene
-		/// @param name - name instance,  "" if no instance edited
-		void setCurrentObject(const std::string &name);
-
-		/// Get current instance from the scene
-		/// @return name current instance, "" if no instance edited
-		const std::string& getCurrentObject() { return _CurrentInstance; }
-
-		/// Get entity from the scene
-		/// @return ref Entity
-		CEntity& getEntity(const std::string &name);
-
-		/// Get full list instances from the scene
-		/// @param listObj - ref of return list instances
-		void getListObjects(std::vector<std::string> &listObj);
-
-		/// Get value background color.
-		/// @return  background color.
-		NLMISC::CRGBA getBackgroundColor() { return _BackgroundColor; }
-
-		/// Get type driver.
-		/// @return true if have used Direct3D driver, false OpenGL driver.
-		inline bool getDirect3D() { return _Direct3D; }
-
-		inline bool getBloomEffect() const { return _BloomEffect; }
-
-		/// Get a pointer to the driver.
-		/// @return pointer to the driver.
-		inline NL3D::UDriver *getDriver() { return _Driver; }
-
-		/// Get a pointer to the scene.
-		/// @return pointer to the scene.
-		inline NL3D::UScene *getScene() { return _Scene; }
-
-		/// Get a manager of playlist
-		/// @return pointer to the UPlayListManager
-		inline NL3D::UPlayListManager *getPlayListManager() { return _PlayListManager; }
-
-		void setCamera(NLMISC::CAABBox &bbox, NL3D::UTransform &entity, bool high_z);
-		bool setupLight(const NLMISC::CVector &position, const NLMISC::CVector &direction);
-
-		virtual void setVisible(bool visible);
-
-	protected:
-#if defined(NL_OS_WINDOWS)
-		virtual bool winEvent(MSG * message, long * result);
-#elif defined(NL_OS_MAC)
-		virtual bool macEvent(EventHandlerCallRef caller, EventRef event);
-#elif defined(NL_OS_UNIX)
-		virtual bool x11Event(XEvent *event);
-#endif
-
-	private Q_SLOTS:
-		void updateRender();
-
-	private:
-		// render stuff
-		QTimer *_mainTimer;
-		bool _isGraphicsInitialized, _isGraphicsEnabled;
-
-		void updateInitialization(bool visible);
-
-		void deleteEntity (CEntity &entity);
-
-		/// Delete all entities
-		void deleteEntities();
-
-		NLMISC::CRGBA 			_BackgroundColor;
-
-		NL3D::UDriver 			*_Driver;
-		NL3D::UScene 			*_Scene;
-		NL3D::UPlayListManager  *_PlayListManager;
-		NL3D::ULight 			*_Light;
-		NL3D::UCamera 			*_Camera;
-		NL3D::U3dMouseListener  *_MouseListener;
-
-		// The entities storage
-		CEntities		_Entities;
-
-		/// Camera parameters.
-		float _phi, _psi, _dist;
-		float _CameraFocal;
-
-		bool _Direct3D;
-		bool _BloomEffect;
-
-		std::string _CurrentInstance;
-
-		// a temporary solution, and later remove
-		friend class CAnimationSetDialog;
-
-	};/* class CObjectViewerWidget */
-
-} /* namespace NLQT */
-
-#endif // OBJECT_VIEWER_WIDGET_H

code/ryzom/tools/leveldesign/georges_editor_qt/src/objectviewer_dialog.cpp

@@ -46,7 +46,7 @@ namespace NLQT
 	{
 		_ui.setupUi(this);
 
-		_nlw = Modules::objViewInt().getWidget();
+		_nlw = dynamic_cast<QNLWidget*>(Modules::objViewInt().getWidget());
 		//_nlw->setObjectName(QString::fromUtf8("nlwidget"));
 		_ui.gridLayout->addWidget(_nlw, 0, 0);
 	}