Subversion Repository Public Repository

Divide-Framework

This repository has no backups
This repository's network speed is throttled to 100KB/sec

Diff Revisions 673 vs 692 for /trunk/Source Code/Geometry/Shapes/Object3D.cpp

Diff revisions: vs.
  @@ -6,33 +6,33 @@
6 6
7 7 namespace Divide {
8 8
9 - Object3D::Object3D(ObjectType type, ObjectFlag flag)
10 - : Object3D("", type, to_uint(flag))
9 + Object3D::Object3D(const stringImpl& name, ObjectType type, ObjectFlag flag)
10 + : Object3D(name, "", type, to_uint(flag))
11 11 {
12 12 }
13 13
14 - Object3D::Object3D(ObjectType type, U32 flagMask)
15 - : Object3D("", type, flagMask)
14 + Object3D::Object3D(const stringImpl& name, ObjectType type, U32 flagMask)
15 + : Object3D(name, "", type, flagMask)
16 16 {
17 17 }
18 18
19 - Object3D::Object3D(const stringImpl& name, ObjectType type, ObjectFlag flag)
20 - : Object3D(name, type, to_uint(flag))
19 + Object3D::Object3D(const stringImpl& name, const stringImpl& resourceLocation, ObjectType type, ObjectFlag flag)
20 + : Object3D(name, resourceLocation, type, to_uint(flag))
21 21 {
22 22 }
23 23
24 - Object3D::Object3D(const stringImpl& name, ObjectType type, U32 flagMask)
25 - : SceneNode(name, SceneNodeType::TYPE_OBJECT3D),
26 - _update(false),
27 - _playAnimations(true),
28 - _geometryType(type),
29 - _geometryFlagMask(flagMask),
30 - _geometryPartitionID(0U)
24 + Object3D::Object3D(const stringImpl& name, const stringImpl& resourceLocation, ObjectType type, U32 flagMask)
25 + : SceneNode(name, resourceLocation, SceneNodeType::TYPE_OBJECT3D),
26 + _update(false),
27 + _playAnimations(true),
28 + _geometryType(type),
29 + _geometryFlagMask(flagMask),
30 + _geometryPartitionID(0U)
31 31 {
32 32 _buffer =
33 33 BitCompare(_geometryFlagMask, to_const_uint(ObjectFlag::OBJECT_FLAG_NO_VB))
34 - ? nullptr
35 - : GFX_DEVICE.newVB();
34 + ? nullptr
35 + : GFX_DEVICE.newVB();
36 36 }
37 37
38 38 Object3D::~Object3D()