Rename "Unit Per Pixel" attribute in Drawable2D to "Pixels Per Unit" to match the actual behavior in StaticSprite2D / AnimatedSprite2D. Remove the attribute from ParticleEmitter2D class as it doesn't have effect. Closes #230.

Source/Engine/LuaScript/pkgs/Urho2D/Drawable2D.pkg

@@ -5,19 +5,19 @@ enum BlendMode {};
 class Drawable2D : public Drawable
 {
 public:
-    void SetUnitPerPixel(float unitPerPixel);
+    void SetPixelsPerUnit(float pixelsPerUnit);
     void SetSprite(Sprite2D* sprite);
     void SetMaterial(Material* material);
     void SetBlendMode(BlendMode mode);
     void SetZValue(float zValue);
 
-    float GetUnitPerPixel() const;
+    float GetPixelsPerUnit() const;
     Sprite2D* GetSprite() const;
     Material* GetMaterial() const;
     BlendMode GetBlendMode() const;
     float GetZValue() const;
 
-    tolua_property__get_set float unitPerPixel;
+    tolua_property__get_set float pixelsPerUnit;
     tolua_property__get_set Sprite2D* sprite;
     tolua_property__get_set Material* material;
     tolua_property__get_set BlendMode blendMode;

Source/Engine/Script/Urho2DAPI.cpp

@@ -63,8 +63,8 @@ template <class T> void RegisterDrawable2D(asIScriptEngine* engine, const char*
 {
     RegisterDrawable<T>(engine, className);
     RegisterSubclass<Drawable2D, T>(engine, "Drawable2D", className);
-    engine->RegisterObjectMethod(className, "void set_unitPerPixel(float)", asMETHOD(T, SetUnitPerPixel), asCALL_THISCALL);
-    engine->RegisterObjectMethod(className, "float get_unitPerPixel() const", asMETHOD(T, GetUnitPerPixel), asCALL_THISCALL);
+    engine->RegisterObjectMethod(className, "void set_pixelsPerUnit(float)", asMETHOD(T, SetPixelsPerUnit), asCALL_THISCALL);
+    engine->RegisterObjectMethod(className, "float get_pixelsPerUnit() const", asMETHOD(T, GetPixelsPerUnit), asCALL_THISCALL);
     engine->RegisterObjectMethod(className, "void set_sprite(Sprite2D@+)", asMETHODPR(T, SetSprite, (Sprite2D*), void), asCALL_THISCALL);
     engine->RegisterObjectMethod(className, "Sprite2D@+ get_sprite() const", asMETHOD(T, GetSprite), asCALL_THISCALL);
     engine->RegisterObjectMethod(className, "void set_material(Material@+)", asMETHODPR(T, SetMaterial, (Material*), void), asCALL_THISCALL);

Source/Engine/Urho2D/Drawable2D.cpp

@@ -44,7 +44,7 @@ extern const char* blendModeNames[];
 
 Drawable2D::Drawable2D(Context* context) :
     Drawable(context, DRAWABLE_GEOMETRY),
-    unitPerPixel_(1.0f),
+    pixelsPerUnit_(1.0f),
     zValue_(0.0f),
     blendMode_(BLEND_ALPHA),
     vertexBuffer_(new VertexBuffer(context_)),
@@ -65,7 +65,7 @@ Drawable2D::~Drawable2D()
 
 void Drawable2D::RegisterObject(Context* context)
 {
-    ACCESSOR_ATTRIBUTE(Drawable2D, VAR_FLOAT, "Unit Per Pixel", GetUnitPerPixel, SetUnitPerPixel, float, 1.0f, AM_DEFAULT);
+    ACCESSOR_ATTRIBUTE(Drawable2D, VAR_FLOAT, "Pixels Per Unit", GetPixelsPerUnit, SetPixelsPerUnit, float, 1.0f, AM_DEFAULT);
     ACCESSOR_ATTRIBUTE(Drawable2D, VAR_FLOAT, "Z Value", GetZValue, SetZValue, float, 0.0f, AM_DEFAULT);
     ACCESSOR_ATTRIBUTE(Drawable2D, VAR_RESOURCEREF, "Sprite", GetSpriteAttr, SetSpriteAttr, ResourceRef, ResourceRef(Sprite2D::GetTypeStatic()), AM_DEFAULT);
     ACCESSOR_ATTRIBUTE(Drawable2D, VAR_RESOURCEREF, "Material", GetMaterialAttr, SetMaterialAttr, ResourceRef, ResourceRef(Material::GetTypeStatic()), AM_DEFAULT);
@@ -138,9 +138,9 @@ UpdateGeometryType Drawable2D::GetUpdateGeometryType()
         return UPDATE_NONE;
 }
 
-void Drawable2D::SetUnitPerPixel(float unitPerPixel)
+void Drawable2D::SetPixelsPerUnit(float pixelsPerUnit)
 {
-    unitPerPixel_ = Max(1.0f, unitPerPixel);
+    pixelsPerUnit_ = Max(1.0f, pixelsPerUnit);
     verticesDirty_ = true;
     geometryDirty_ = true;
     OnMarkedDirty(node_);

Source/Engine/Urho2D/Drawable2D.h

@@ -52,8 +52,8 @@ public:
     /// Return whether a geometry update is necessary, and if it can happen in a worker thread.
     virtual UpdateGeometryType GetUpdateGeometryType();
 
-    /// Set Unit per pixel.
-    void SetUnitPerPixel(float unitPerPixel);
+    /// Set pixels per coordinate unit.
+    void SetPixelsPerUnit(float pixelsPerUnit);
     /// Set sprite.
     void SetSprite(Sprite2D* sprite);
     /// Set material.
@@ -63,8 +63,8 @@ public:
     /// Set Z value.
     void SetZValue(float zValue);
 
-    /// Return unit per pixel.
-    float GetUnitPerPixel() const { return unitPerPixel_; }
+    /// Return pixels per coordinate unit.
+    float GetPixelsPerUnit() const { return pixelsPerUnit_; }
     /// Return sprite.
     Sprite2D* GetSprite() const { return sprite_; }
     /// Return material.
@@ -98,8 +98,8 @@ protected:
     /// Update the material's properties (blend mode and texture).
     void UpdateMaterial();
 
-    /// Unit per pixel.
-    float unitPerPixel_;
+    /// Pixels per coordinate unit.
+    float pixelsPerUnit_;
     /// Z value.
     float zValue_;
     /// Sprite.

Source/Engine/Urho2D/ParticleEmitter2D.cpp

@@ -55,6 +55,7 @@ void ParticleEmitter2D::RegisterObject(Context* context)
 
     ACCESSOR_ATTRIBUTE(ParticleEmitter2D, VAR_RESOURCEREF, "Particle Model", GetParticleModelAttr, SetParticleModelAttr, ResourceRef, ResourceRef(ParticleModel2D::GetTypeStatic()), AM_DEFAULT);
     COPY_BASE_ATTRIBUTES(ParticleEmitter2D, Drawable2D);
+    REMOVE_ATTRIBUTE(ParticleEmitter2D, "Pixels Per Unit");
 }
 
 void ParticleEmitter2D::OnSetEnabled()

Source/Engine/Urho2D/StaticSprite2D.cpp

@@ -121,9 +121,9 @@ void StaticSprite2D::UpdateVertices()
     Vertex2D vertex2;
     Vertex2D vertex3;
 
-    float pixelPerUnit = 1.0f / unitPerPixel_;
-    float width = (float)rectangle_.Width() * pixelPerUnit;
-    float height = (float)rectangle_.Height() * pixelPerUnit;
+    float unitsPerPixel = 1.0f / pixelsPerUnit_;
+    float width = (float)rectangle_.Width() * unitsPerPixel;
+    float height = (float)rectangle_.Height() * unitsPerPixel;
 
     const Vector2& hotSpot = sprite_->GetHotSpot();
     float hotSpotX = flipX_ ? (1.0f - hotSpot.x_) : hotSpot.x_;