@@ -109,31 +109,31 @@ class PlaneVertexBufferFunctor : public QBufferDataGenerator
109
109
{
110
110
public:
111
111
explicit PlaneVertexBufferFunctor ( int resolution, const QByteArray &heightMap )
112
- : m_resolution ( resolution )
113
- , m_heightMap ( heightMap )
112
+ : mResolution ( resolution )
113
+ , mHeightMap ( heightMap )
114
114
{}
115
115
116
116
~PlaneVertexBufferFunctor () {}
117
117
118
118
QByteArray operator ()() Q_DECL_FINAL
119
119
{
120
- return createPlaneVertexData ( m_resolution, m_heightMap );
120
+ return createPlaneVertexData ( mResolution , mHeightMap );
121
121
}
122
122
123
123
bool operator ==( const QBufferDataGenerator &other ) const Q_DECL_FINAL
124
124
{
125
125
const PlaneVertexBufferFunctor *otherFunctor = functor_cast<PlaneVertexBufferFunctor>( &other );
126
126
if ( otherFunctor != nullptr )
127
- return ( otherFunctor->m_resolution == m_resolution &&
128
- otherFunctor->m_heightMap == m_heightMap );
127
+ return ( otherFunctor->mResolution == mResolution &&
128
+ otherFunctor->mHeightMap == mHeightMap );
129
129
return false ;
130
130
}
131
131
132
132
QT3D_FUNCTOR ( PlaneVertexBufferFunctor )
133
133
134
134
private:
135
- int m_resolution ;
136
- QByteArray m_heightMap ;
135
+ int mResolution ;
136
+ QByteArray mHeightMap ;
137
137
};
138
138
139
139
@@ -142,28 +142,28 @@ class PlaneIndexBufferFunctor : public QBufferDataGenerator
142
142
{
143
143
public:
144
144
explicit PlaneIndexBufferFunctor ( int resolution )
145
- : m_resolution ( resolution )
145
+ : mResolution ( resolution )
146
146
{}
147
147
148
148
~PlaneIndexBufferFunctor () {}
149
149
150
150
QByteArray operator ()() Q_DECL_FINAL
151
151
{
152
- return createPlaneIndexData ( m_resolution );
152
+ return createPlaneIndexData ( mResolution );
153
153
}
154
154
155
155
bool operator ==( const QBufferDataGenerator &other ) const Q_DECL_FINAL
156
156
{
157
157
const PlaneIndexBufferFunctor *otherFunctor = functor_cast<PlaneIndexBufferFunctor>( &other );
158
158
if ( otherFunctor != nullptr )
159
- return ( otherFunctor->m_resolution == m_resolution );
159
+ return ( otherFunctor->mResolution == mResolution );
160
160
return false ;
161
161
}
162
162
163
163
QT3D_FUNCTOR ( PlaneIndexBufferFunctor )
164
164
165
165
private:
166
- int m_resolution ;
166
+ int mResolution ;
167
167
};
168
168
169
169
@@ -172,14 +172,8 @@ class PlaneIndexBufferFunctor : public QBufferDataGenerator
172
172
173
173
DemTerrainTileGeometry::DemTerrainTileGeometry ( int resolution, const QByteArray &heightMap, DemTerrainTileGeometry::QNode *parent )
174
174
: QGeometry( parent )
175
- , m_resolution( resolution )
176
- , m_heightMap( heightMap )
177
- , m_positionAttribute( nullptr )
178
- , m_normalAttribute( nullptr )
179
- , m_texCoordAttribute( nullptr )
180
- , m_indexAttribute( nullptr )
181
- , m_vertexBuffer( nullptr )
182
- , m_indexBuffer( nullptr )
175
+ , mResolution( resolution )
176
+ , mHeightMap( heightMap )
183
177
{
184
178
init ();
185
179
}
@@ -188,80 +182,59 @@ DemTerrainTileGeometry::~DemTerrainTileGeometry()
188
182
{
189
183
}
190
184
191
- QAttribute *DemTerrainTileGeometry::positionAttribute () const
192
- {
193
- return m_positionAttribute;
194
- }
195
-
196
- QAttribute *DemTerrainTileGeometry::normalAttribute () const
197
- {
198
- return m_normalAttribute;
199
- }
200
-
201
- QAttribute *DemTerrainTileGeometry::texCoordAttribute () const
202
- {
203
- return m_texCoordAttribute;
204
- }
205
-
206
- QAttribute *DemTerrainTileGeometry::indexAttribute () const
207
- {
208
- return m_indexAttribute;
209
- }
210
-
211
-
212
185
void DemTerrainTileGeometry::init ()
213
186
{
214
- m_positionAttribute = new QAttribute ( this );
215
- m_normalAttribute = new QAttribute ( this );
216
- m_texCoordAttribute = new QAttribute ( this );
217
- m_indexAttribute = new QAttribute ( this );
218
- m_vertexBuffer = new Qt3DRender::QBuffer ( Qt3DRender::QBuffer::VertexBuffer, this );
219
- m_indexBuffer = new Qt3DRender::QBuffer ( Qt3DRender::QBuffer::IndexBuffer, this );
220
-
221
- const int nVerts = m_resolution * m_resolution ;
187
+ mPositionAttribute = new QAttribute ( this );
188
+ mNormalAttribute = new QAttribute ( this );
189
+ mTexCoordAttribute = new QAttribute ( this );
190
+ mIndexAttribute = new QAttribute ( this );
191
+ mVertexBuffer = new Qt3DRender::QBuffer ( Qt3DRender::QBuffer::VertexBuffer, this );
192
+ mIndexBuffer = new Qt3DRender::QBuffer ( Qt3DRender::QBuffer::IndexBuffer, this );
193
+
194
+ const int nVerts = mResolution * mResolution ;
222
195
const int stride = ( 3 + 2 + 3 ) * sizeof ( float );
223
- const int faces = 2 * ( m_resolution - 1 ) * ( m_resolution - 1 );
224
-
225
- m_positionAttribute ->setName ( QAttribute::defaultPositionAttributeName () );
226
- m_positionAttribute ->setVertexBaseType ( QAttribute::Float );
227
- m_positionAttribute ->setVertexSize ( 3 );
228
- m_positionAttribute ->setAttributeType ( QAttribute::VertexAttribute );
229
- m_positionAttribute ->setBuffer ( m_vertexBuffer );
230
- m_positionAttribute ->setByteStride ( stride );
231
- m_positionAttribute ->setCount ( nVerts );
232
-
233
- m_texCoordAttribute ->setName ( QAttribute::defaultTextureCoordinateAttributeName () );
234
- m_texCoordAttribute ->setVertexBaseType ( QAttribute::Float );
235
- m_texCoordAttribute ->setVertexSize ( 2 );
236
- m_texCoordAttribute ->setAttributeType ( QAttribute::VertexAttribute );
237
- m_texCoordAttribute ->setBuffer ( m_vertexBuffer );
238
- m_texCoordAttribute ->setByteStride ( stride );
239
- m_texCoordAttribute ->setByteOffset ( 3 * sizeof ( float ) );
240
- m_texCoordAttribute ->setCount ( nVerts );
241
-
242
- m_normalAttribute ->setName ( QAttribute::defaultNormalAttributeName () );
243
- m_normalAttribute ->setVertexBaseType ( QAttribute::Float );
244
- m_normalAttribute ->setVertexSize ( 3 );
245
- m_normalAttribute ->setAttributeType ( QAttribute::VertexAttribute );
246
- m_normalAttribute ->setBuffer ( m_vertexBuffer );
247
- m_normalAttribute ->setByteStride ( stride );
248
- m_normalAttribute ->setByteOffset ( 5 * sizeof ( float ) );
249
- m_normalAttribute ->setCount ( nVerts );
250
-
251
- m_indexAttribute ->setAttributeType ( QAttribute::IndexAttribute );
252
- m_indexAttribute ->setVertexBaseType ( QAttribute::UnsignedInt );
253
- m_indexAttribute ->setBuffer ( m_indexBuffer );
196
+ const int faces = 2 * ( mResolution - 1 ) * ( mResolution - 1 );
197
+
198
+ mPositionAttribute ->setName ( QAttribute::defaultPositionAttributeName () );
199
+ mPositionAttribute ->setVertexBaseType ( QAttribute::Float );
200
+ mPositionAttribute ->setVertexSize ( 3 );
201
+ mPositionAttribute ->setAttributeType ( QAttribute::VertexAttribute );
202
+ mPositionAttribute ->setBuffer ( mVertexBuffer );
203
+ mPositionAttribute ->setByteStride ( stride );
204
+ mPositionAttribute ->setCount ( nVerts );
205
+
206
+ mTexCoordAttribute ->setName ( QAttribute::defaultTextureCoordinateAttributeName () );
207
+ mTexCoordAttribute ->setVertexBaseType ( QAttribute::Float );
208
+ mTexCoordAttribute ->setVertexSize ( 2 );
209
+ mTexCoordAttribute ->setAttributeType ( QAttribute::VertexAttribute );
210
+ mTexCoordAttribute ->setBuffer ( mVertexBuffer );
211
+ mTexCoordAttribute ->setByteStride ( stride );
212
+ mTexCoordAttribute ->setByteOffset ( 3 * sizeof ( float ) );
213
+ mTexCoordAttribute ->setCount ( nVerts );
214
+
215
+ mNormalAttribute ->setName ( QAttribute::defaultNormalAttributeName () );
216
+ mNormalAttribute ->setVertexBaseType ( QAttribute::Float );
217
+ mNormalAttribute ->setVertexSize ( 3 );
218
+ mNormalAttribute ->setAttributeType ( QAttribute::VertexAttribute );
219
+ mNormalAttribute ->setBuffer ( mVertexBuffer );
220
+ mNormalAttribute ->setByteStride ( stride );
221
+ mNormalAttribute ->setByteOffset ( 5 * sizeof ( float ) );
222
+ mNormalAttribute ->setCount ( nVerts );
223
+
224
+ mIndexAttribute ->setAttributeType ( QAttribute::IndexAttribute );
225
+ mIndexAttribute ->setVertexBaseType ( QAttribute::UnsignedInt );
226
+ mIndexAttribute ->setBuffer ( mIndexBuffer );
254
227
255
228
// Each primitive has 3 vertives
256
- m_indexAttribute ->setCount ( faces * 3 );
229
+ mIndexAttribute ->setCount ( faces * 3 );
257
230
258
- m_vertexBuffer ->setDataGenerator ( QSharedPointer<PlaneVertexBufferFunctor>::create ( m_resolution, m_heightMap ) );
259
- m_indexBuffer ->setDataGenerator ( QSharedPointer<PlaneIndexBufferFunctor>::create ( m_resolution ) );
231
+ mVertexBuffer ->setDataGenerator ( QSharedPointer<PlaneVertexBufferFunctor>::create ( mResolution , mHeightMap ) );
232
+ mIndexBuffer ->setDataGenerator ( QSharedPointer<PlaneIndexBufferFunctor>::create ( mResolution ) );
260
233
261
- addAttribute ( m_positionAttribute );
262
- addAttribute ( m_texCoordAttribute );
263
- addAttribute ( m_normalAttribute );
264
- addAttribute ( m_indexAttribute );
234
+ addAttribute ( mPositionAttribute );
235
+ addAttribute ( mTexCoordAttribute );
236
+ addAttribute ( mNormalAttribute );
237
+ addAttribute ( mIndexAttribute );
265
238
}
266
239
267
240
// / @endcond
0 commit comments