Commit ed0c757ed16ecfdafc0eba2c510ec3a4c3abfd21

Sarah Smith
Tue Mar 09 01:10:25 CET 2010

Tree SHA1: 4be1e9d
Parent SHA1: 0145e12 (Fix some issues exposed by model node abuse.)
raw diff | raw patch

Remove a layer of func call overhead.

QGLOperation is now a completely inlined "syntactic sugar" class that
costs pretty much zero to use.

Diff rendering mode:
inline
side by side


67	67	inline void end();
68	68	private:
69	69	QGLDisplayList *m_list;
	70	QGLPrimitive *m_prim;
70	71	};
71	72
72	73	inline QGLOperation::QGLOperation(QGLDisplayList *list, QGL::Operation op)
73	74	: m_list(list)
74	75	{
75	76	m_list->begin(op);
	77	m_prim = m_list->currentPrimitive();
76	78	}
77	79
78	80	inline QGLOperation::~QGLOperation()
…	…
84	84
85	85	inline void QGLOperation::setFlags(QGL::OperationFlags flags)
86	86	{
87		m_list->setFlags(flags);
	87	m_prim->setFlags(flags);
88	88	}
89	89
90	90	inline QGL::OperationFlags QGLOperation::flags() const
91	91	{
92		return m_list->flags();
	92	return m_prim->flags();
93	93	}
94	94
95	95	inline void QGLOperation::addVertex(const QVector3D &vertex)
96	96	{
97		m_list->addVertex(vertex);
	97	m_prim->appendVertex(vertex);
98	98	}
99	99
100	100	inline void QGLOperation::addNormal(const QVector3D &normal)
101	101	{
102		m_list->addNormal(normal);
	102	m_prim->appendNormal(normal);
103	103	}
104	104
105	105	inline void QGLOperation::addColor(const QColor4B &color)
106	106	{
107		m_list->addColor(color);
	107	m_prim->appendColor(color);
108	108	}
109	109
110	110	inline void QGLOperation::addTexCoord(const QVector2D &texCoord,
111	111	QGL::VertexAttribute attr)
112	112	{
113		m_list->addTexCoord(texCoord, attr);
	113	m_prim->appendTexCoord(texCoord, attr);
114	114	}
115	115
116	116	inline void QGLOperation::addAttribute(const QVector3D &a, QGL::VertexAttribute attr)
117	117	{
118		m_list->addAttribute(a, attr);
	118	m_prim->appendAttribute(a, attr);
119	119	}
120	120
121	121	inline void QGLOperation::addVertexArray(const QVector3DArray &vertices)
122	122	{
123		m_list->addVertexArray(vertices);
	123	m_prim->appendVertexArray(vertices);
124	124	}
125	125
126	126	inline void QGLOperation::addNormalArray(const QVector3DArray &normals)
127	127	{
128		m_list->addNormalArray(normals);
	128	m_prim->appendNormalArray(normals);
129	129	}
130	130
131	131	inline void QGLOperation::addColorArray(const QArray<QColor4B> &colors)
132	132	{
133		m_list->addColorArray(colors);
	133	m_prim->appendColorArray(colors);
134	134	}
135	135
136	136	inline void QGLOperation::addTexCoordArray(const QVector2DArray &texCoords,
137	137	QGL::VertexAttribute attr)
138	138	{
139		m_list->addTexCoordArray(texCoords, attr);
	139	m_prim->appendTexCoordArray(texCoords, attr);
140	140	}
141	141
142	142	inline void QGLOperation::addAttributeArray(const QCustomDataArray &ary, QGL::VertexAttribute attr)
143	143	{
144		m_list->addAttributeArray(ary, attr);
	144	m_prim->appendAttributeArray(ary, attr);
145	145	}
146	146
147	147	inline void QGLOperation::end()

Commit ed0c757ed16ecfdafc0eba2c510ec3a4c3abfd21

Gitorious