qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2

This commit is contained in:
Aaron Kennedy 2011-06-09 15:23:12 +10:00
parent 9bcea0318c 283a37447b
commit 7cf421d04d
9 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
demos/declarative/minehunt/MinehuntCore/Explosion.qml
View File

@ -40,7 +40,7 @@
****************************************************************************/
import QtQuick 1.0
import QtQuick.Particles 1.0
import Qt.labs.particles 1.0
Item {
property bool explode : false

2
demos/declarative/photoviewer/PhotoViewerCore/AlbumDelegate.qml
View File

@ -85,7 +85,7 @@ Component {
anchors.centerIn: parent; anchors.verticalCenterOffset: -30
path: Path {
PathAttribute { name: 'z'; value: 9999.0 }
PathLineShape { x: 1; y: 1 }
PathLine { x: 1; y: 1 }
PathAttribute { name: 'z'; value: 0.0 }
}
}

2
demos/declarative/snake/content/Cookie.qml
View File

@ -40,7 +40,7 @@
****************************************************************************/
import QtQuick 1.0
import QtQuick.Particles 1.0
import Qt.labs.particles 1.0
Item {
id: root

2
demos/declarative/snake/content/Link.qml
View File

@ -40,7 +40,7 @@
****************************************************************************/
import QtQuick 1.0
import QtQuick.Particles 1.0
import Qt.labs.particles 1.0
Item { id:link
property bool dying: false

2
src/declarative/particles/qsgparticleaffector.cpp
View File

@ -56,6 +56,8 @@ QSGParticleAffector::QSGParticleAffector(QSGItem *parent) :
void QSGParticleAffector::componentComplete()
{
if(!m_system && qobject_cast<QSGParticleSystem*>(parentItem()))
setSystem(qobject_cast<QSGParticleSystem*>(parentItem()));
if(!m_system)
qWarning() << "Affector created without a particle system specified";//TODO: useful QML warnings, like line number?
QSGItem::componentComplete();

2
src/declarative/particles/qsgparticleemitter.cpp
View File

@ -76,6 +76,8 @@ QSGParticleEmitter::~QSGParticleEmitter()
void QSGParticleEmitter::componentComplete()
{
if(!m_system && qobject_cast<QSGParticleSystem*>(parentItem()))
setSystem(qobject_cast<QSGParticleSystem*>(parentItem()));
if(!m_system)
qWarning() << "Emitter created without a particle system specified";//TODO: useful QML warnings, like line number?
QSGItem::componentComplete();

4
src/declarative/particles/qsgparticlepainter.cpp
View File

@ -54,8 +54,10 @@ QSGParticlePainter::QSGParticlePainter(QSGItem *parent) :
void QSGParticlePainter::componentComplete()
{
if(!m_system && qobject_cast<QSGParticleSystem*>(parentItem()))
setSystem(qobject_cast<QSGParticleSystem*>(parentItem()));
if(!m_system)
qWarning() << "Particle created without a particle system specified";//TODO: useful QML warnings, like line number?
qWarning() << "ParticlePainter created without a particle system specified";//TODO: useful QML warnings, like line number?
QSGItem::componentComplete();
}

10
src/declarative/particles/qsgparticlesystem.cpp
View File

@ -67,7 +67,9 @@ QSGParticleData::QSGParticleData()
}
QSGParticleSystem::QSGParticleSystem(QSGItem *parent) :
QSGItem(parent), m_particle_count(0), m_running(true) , m_startTime(0), m_overwrite(false)
QSGItem(parent), m_particle_count(0), m_running(true)
, m_startTime(0), m_overwrite(false)
, m_componentComplete(false)
{
m_groupIds = QHash<QString, int>();
}
@ -111,7 +113,9 @@ void QSGParticleSystem::setRunning(bool arg)
void QSGParticleSystem::componentComplete()
{
QSGItem::componentComplete();
reset();
m_componentComplete = true;
if(!m_emitters.isEmpty() && !m_particles.isEmpty())
reset();
}
void QSGParticleSystem::initializeSystem()
@ -191,6 +195,8 @@ void QSGParticleSystem::initializeSystem()
void QSGParticleSystem::reset()
{
if(!m_componentComplete)
return;//Batch starting reset()s a little
//Clear guarded pointers which have been deleted
int cleared = 0;
cleared += m_emitters.removeAll(0);

1
src/declarative/particles/qsgparticlesystem_p.h
View File

@ -163,6 +163,7 @@ private:
qint64 m_startTime;
int m_nextGroupId;
bool m_overwrite;
bool m_componentComplete;
};
//TODO: Clean up all this into ParticleData