[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    playground/games/kolf-ng
From:       Stefan Majewsky <majewsky () gmx ! net>
Date:       2009-09-23 10:31:15
Message-ID: 1253701875.697684.31883.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1027122 by majewsky:

Start to implement the new texture blender interface, which I call "blender stacker", \
because the height ranges are stacked up.

 M  +2 -0      CMakeLists.txt  
 A             editor/blender-stacker-texturebar.cpp   [License: GPL (v2+)]
 A             editor/blender-stacker-texturebar.h   [License: GPL (v2+)]
 A             editor/blender-stacker.cpp   [License: GPL (v2+)]
 A             editor/blender-stacker.h   [License: GPL (v2+)]
 M  +7 -4      editor/blender-widget.cpp  
 M  +2 -0      editor/blender-widget.h  


--- trunk/playground/games/kolf-ng/CMakeLists.txt #1027121:1027122
@@ -19,6 +19,8 @@
 	editor/blender-itemeditor.cpp
 	editor/blender-manager.cpp
 	editor/blender-model.cpp
+	editor/blender-stacker.cpp
+	editor/blender-stacker-texturebar.cpp
 	editor/blender-texture.cpp
 	editor/blender-texturepool.cpp
 	editor/blender-widget.cpp
--- trunk/playground/games/kolf-ng/editor/blender-widget.cpp #1027121:1027122
@@ -19,6 +19,7 @@
 
 #include "blender-widget.h"
 #include "blender-manager.h"
+#include "blender-stacker.h"
 
 #include <QGridLayout>
 #include <QLabel>
@@ -28,8 +29,9 @@
 
 Kolf::BlenderWidget::BlenderWidget()
 	: Kolf::GameUIPageWidget(i18n("Texture blender"))
-	, m_manager(new BlenderManager(this))
+	, m_manager(new Kolf::BlenderManager(this))
 	, m_textureViewer(new QLabel)
+	, m_stacker(new Kolf::BlenderStacker)
 {
 	m_textureViewer->setPixmap(QPixmap(512, 512)); //FIXME: hack (the Manager should \
give an empty QImage with the correct size before the first blending)  setupUI();
@@ -41,9 +43,10 @@
 {
 	QGridLayout* layout = new QGridLayout;
 	QPushButton* button = new QPushButton(i18n("Regenerate texture"));
-	layout->addWidget(m_manager->view(), 0, 0);
-	layout->addWidget(button, 1, 0);
-	layout->addWidget(m_textureViewer, 0, 1, 2, 1);
+	layout->addWidget(m_stacker, 0, 0);
+	layout->addWidget(m_manager->view(), 0, 1);
+	layout->addWidget(button, 1, 0, 1, 2);
+	layout->addWidget(m_textureViewer, 0, 2, 2, 1);
 	connect(button, SIGNAL(clicked()), m_manager, SLOT(startBlending()));
 	setLayout(layout);
 }
--- trunk/playground/games/kolf-ng/editor/blender-widget.h #1027121:1027122
@@ -26,6 +26,7 @@
 namespace Kolf
 {
 	class BlenderManager;
+	class BlenderStacker;
 
 	class BlenderWidget : public Kolf::GameUIPageWidget
 	{
@@ -42,6 +43,7 @@
 
 			Kolf::BlenderManager* m_manager;
 			QLabel* m_textureViewer;
+			Kolf::BlenderStacker* m_stacker;
 	};
 }
 


[prev in list] [next in list] [prev in thread] [next in thread]