ldforge: comparison src/glcompiler.cpp

-:0fb1d3d17b60
+:68e126e8c629
 	connect(renderer->model(), SIGNAL(objectModified(LDObject*)), this, SLOT(compileObject(LDObject*)));
 	connect(renderer->model(), SIGNAL(aboutToRemoveObject(LDObject*)), this, SLOT(forgetObject(LDObject*)), Qt::DirectConnection);
 	connect(renderer, SIGNAL(objectHighlightingChanged(LDObject*)), this, SLOT(compileObject(LDObject*)));
 	connect(m_window, SIGNAL(gridChanged()), this, SLOT(recompile()));
-	for (LDObject* object : renderer->model()->objects())
+	for (QModelIndex index : renderer->model()->indices())
-		stageForCompilation(object);
+	{
+		print("%1", index);
+		stageForCompilation(index);
+	}
 }
 /*
 * Initializes the VBOs after OpenGL is initialized.
 */
 }
 /*
 * Stages the given object for compilation.
 */
-void GLCompiler::stageForCompilation(LDObject* obj)
+void GLCompiler::stageForCompilation(QModelIndex index)
 {
-	m_staged << obj;
+	m_staged.insert(index);
 }
 /*
 * Removes an object from the set of objects to be compiled.
 */
-void GLCompiler::unstage(LDObject* obj)
+void GLCompiler::unstage(QModelIndex index)
 {
-	m_staged.remove (obj);
+	m_staged.remove(index);
+}
+LDObject* GLCompiler::resolveObject(const QModelIndex& index)
+{
+	return m_renderer->model()->data(index, Model::ObjectRole).value<LDObject*>();
 }
 /*
 * Compiles all staged objects.
 */
 void GLCompiler::compileStaged()
 {
-	for (LDObject* object : m_staged)
+	for (const QModelIndex& index : m_staged)
-		compileObject(object);
+		compileObject(index);
 	m_staged.clear();
 }
 /*
 	if (m_vboChanged[vbonum])
 	{
 		// Merge the VBO into a vector of floats.
 		QVector<GLfloat> vbodata;
-		for (auto it = m_objectInfo.begin(); it != m_objectInfo.end();)
+		for (
-		{
+			auto iterator = m_objectInfo.begin();
-			if (it.key() == nullptr)
+			iterator != m_objectInfo.end();
-			{
+		) {
-				it = m_objectInfo.erase(it);
+			if (not iterator.key().isValid())
+			{
+				iterator = m_objectInfo.erase(iterator);
 			}
 			else
 			{
-				if (not it.key()->isHidden())
+				LDObject* object = resolveObject(iterator.key());
-					vbodata += it->data[vbonum];
+				if (not object->isHidden())
+					vbodata += iterator->data[vbonum];
-				++it;
+				++iterator;
 			}
 		}
 		// Transfer the VBO to the graphics processor.
 		glBindBuffer (GL_ARRAY_BUFFER, m_vbo[vbonum]);
 }
 /*
 * Removes the data related to the given object.
 */
-void GLCompiler::dropObjectInfo(LDObject* object)
+void GLCompiler::dropObjectInfo(const QModelIndex& index)
 {
-	if (m_objectInfo.contains(object))
+	if (m_objectInfo.contains(index))
 	{
-		// If we have data relating to this object, remove it. The VBOs have changed now and need to be merged.
+		// If we have data relating to this object, remove it.
-		m_objectInfo.remove(object);
+		// The VBOs have changed now and need to be merged.
+		m_objectInfo.remove(index);
 		needMerge();
 	}
 }
 /*
 * Makes the compiler forget about the given object completely.
 */
-void GLCompiler::forgetObject(LDObject* object)
+void GLCompiler::forgetObject(QModelIndex index)
 {
-	dropObjectInfo(object);
+	dropObjectInfo(index);
-	unstage(object);
+	unstage(index);
 }
 /*
 * Compiles a single object.
 */
-void GLCompiler::compileObject(LDObject* object)
+void GLCompiler::compileObject(QModelIndex index)
 {
+	LDObject* object = resolveObject(index);
 	if (object == nullptr)
 		return;
 	ObjectVboData info;
-	dropObjectInfo(object);
+	dropObjectInfo(index);
 	switch (object->type())
 	{
-	// Note: We cannot split quads into triangles here, it would mess up the wireframe view.
+	// Note: We cannot split quads into triangles here, it would mess up the
-	// Quads must go into separate vbos.
+	// wireframe view. Quads must go into separate vbos.
 	case LDObjectType::Triangle:
 	case LDObjectType::Quadrilateral:
 	case LDObjectType::EdgeLine:
 	case LDObjectType::ConditionalEdge:
 		{
 	default:
 		break;
 	}
-	m_objectInfo[object] = info;
+	m_objectInfo[index] = info;
 	needMerge();
 }
 /*
 * Inserts a single polygon into VBOs.
 /*
 * Recompiles the entire model.
 */
 void GLCompiler::recompile()
 {
-	for (LDObject* object : m_renderer->model()->objects())
+	for (QModelIndex index : m_renderer->model()->indices())
-		compileObject(object);
+		compileObject(index);
 }

Mercurial > ldforge / file comparison

comparison: src/glcompiler.cpp

src/glcompiler.cpp