Subversion Repository Public Repository

Divide-Framework

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

Diff Revisions 336 vs 337 for /trunk/Source Code/Core/Resources/Headers/ResourceDescriptor.h

Diff revisions: vs.
  @@ -37,12 +37,12 @@
37 37 enum DescriptorType{
38 38 DESCRIPTOR_TEXTURE = 0,
39 39 DESCRIPTOR_SAMPLER = 1,
40 - DESCRIPTOR_PARTICLE = 2
40 + DESCRIPTOR_PARTICLE = 2
41 41 };
42 42
43 43 explicit PropertyDescriptor(const DescriptorType& type) : _type(type)
44 - {
45 - }
44 + {
45 + }
46 46
47 47 protected:
48 48 friend class ResourceDescriptor;
  @@ -69,7 +69,7 @@
69 69
70 70 inline const stringImpl& getPropertyListString() const {return _properties;}
71 71 inline const stringImpl& getResourceLocation() const {return _resourceLocation;}
72 - inline const stringImpl& getName() const {return _name;}
72 + inline const stringImpl& getName() const {return _name;}
73 73
74 74 template<typename T>
75 75 inline const T* getPropertyDescriptor() const {
  @@ -77,18 +77,18 @@
77 77 }
78 78
79 79 inline bool hasPropertyDescriptor() const {return _propertyDescriptor != nullptr;}
80 - inline bool getFlag() const {return _flag;}
80 + inline bool getFlag() const {return _flag;}
81 81 inline bool getThreaded() const {return _threaded;}
82 82 inline U8 getEnumValue() const {return _enumValue;}
83 - inline U32 getId() const {return _id;}
83 + inline U32 getId() const {return _id;}
84 84 inline P32 getMask() const {return _mask;}
85 85
86 86 inline void setPropertyList(const stringImpl& propertyListString) {_properties = propertyListString;}
87 87 inline void setResourceLocation(const stringImpl& resourceLocation) {_resourceLocation = resourceLocation;}
88 88 inline void setEnumValue(U8 enumValue) {_enumValue = enumValue;}
89 - inline void setName(const stringImpl& name) {_name = name;}
90 - inline void setFlag(bool flag) {_flag = flag;}
91 - inline void setId(U32 id) {_id = id;}
89 + inline void setName(const stringImpl& name) {_name = name;}
90 + inline void setFlag(bool flag) {_flag = flag;}
91 + inline void setId(U32 id) {_id = id;}
92 92 inline void setBoolMask(P32 mask) {_mask = mask;}
93 93 inline void setThreadedLoading(const bool threaded) {_threaded = threaded;}
94 94
  @@ -99,7 +99,7 @@
99 99
100 100 private:
101 101 /// Item name
102 - stringImpl _name;
102 + stringImpl _name;
103 103 /// Physical file location
104 104 stringImpl _resourceLocation;
105 105 /// Comma separated list of properties