Переглянути джерело

Code convention edits. Added contributor credit.

Lasse Öörni 10 роки тому
батько
коміт
74e7d027b0
3 змінених файлів з 15 додано та 15 видалено
  1. 1 0
      Docs/Urho3D.dox
  2. 1 0
      README.md
  3. 13 15
      bin/Data/Scripts/Editor/EditorParticleEffect.as

+ 1 - 0
Docs/Urho3D.dox

@@ -92,6 +92,7 @@ Urho3D development, contributions and bugfixes by:
 - Hualin Song
 - Hualin Song
 - James Thomas
 - James Thomas
 - Joshua Tippetts
 - Joshua Tippetts
+- Yusuf Umar
 - Daniel Wiberg
 - Daniel Wiberg
 - Steven Zhang
 - Steven Zhang
 - AGreatFish
 - AGreatFish

+ 1 - 0
README.md

@@ -44,6 +44,7 @@ Urho3D development, contributions and bugfixes by:
 - Hualin Song
 - Hualin Song
 - James Thomas
 - James Thomas
 - Joshua Tippetts
 - Joshua Tippetts
+- Yusuf Umar
 - Daniel Wiberg
 - Daniel Wiberg
 - Steven Zhang
 - Steven Zhang
 - AGreatFish
 - AGreatFish

+ 13 - 15
bin/Data/Scripts/Editor/EditorParticleEffect.as

@@ -21,9 +21,9 @@ Vector3 particleViewCamDir;
 Vector3 particleViewCamRot;
 Vector3 particleViewCamRot;
 float particleViewCamDist;
 float particleViewCamDist;
 
 
-float gizmo_offset = 0.1f;
-float gizmo_offset_x;
-float gizmo_offset_y;
+float gizmoOffset = 0.1f;
+float gizmoOffsetX;
+float gizmoOffsetY;
 
 
 void CreateParticleEffectEditor()
 void CreateParticleEffectEditor()
 {
 {
@@ -135,9 +135,9 @@ void CreateParticleEffectEditor()
 
 
 void SetGizmoPosition()
 void SetGizmoPosition()
 {
 {
-    Vector3 screen_pos = Vector3(gizmo_offset_x, gizmo_offset_y, 25.0);
-    Vector3 new_pos = particlePreviewCamera.ScreenToWorldPoint(screen_pos);
-    particleEffectPreviewGizmoNode.position = new_pos;
+    Vector3 screenPos = Vector3(gizmoOffsetX, gizmoOffsetY, 25.0);
+    Vector3 newPos = particlePreviewCamera.ScreenToWorldPoint(screenPos);
+    particleEffectPreviewGizmoNode.position = newPos;
 }
 }
 
 
 void ResetCameraTransformation()
 void ResetCameraTransformation()
@@ -147,8 +147,7 @@ void ResetCameraTransformation()
     particleViewCamDir = -particlePreviewCameraNode.position;
     particleViewCamDir = -particlePreviewCameraNode.position;
     
     
     // Manually set initial rotation because eulerAngle always return 0 on first frame
     // Manually set initial rotation because eulerAngle always return 0 on first frame
-    particleViewCamRot = Vector3(0.0, 180.0, 0.0); 
-    //particleViewCamRot = particlePreviewCameraNode.rotation.eulerAngles;
+    particleViewCamRot = Vector3(0.0, 180.0, 0.0);
 
 
     particleViewCamDist = particleViewCamDir.length;
     particleViewCamDist = particleViewCamDir.length;
     particleViewCamDir.Normalize();
     particleViewCamDir.Normalize();
@@ -165,7 +164,6 @@ void ParticleEffectShowGrid(StringHash eventType, VariantMap& eventData)
 {
 {
     CheckBox@ element = eventData["Element"].GetPtr();
     CheckBox@ element = eventData["Element"].GetPtr();
     showParticlePreviewAxes = element.checked;
     showParticlePreviewAxes = element.checked;
-    //particleEffectPreviewGizmoNode.enabled = showParticlePreviewAxes;
     particleEffectPreviewGridNode.enabled = showParticlePreviewAxes;
     particleEffectPreviewGridNode.enabled = showParticlePreviewAxes;
     particleEffectPreview.QueueUpdate();
     particleEffectPreview.QueueUpdate();
 }
 }
@@ -213,7 +211,7 @@ void EditParticleEffectColorFrameRemove(StringHash eventType, VariantMap& eventD
         return;
         return;
 
 
     ListView@ lv = particleEffectWindow.GetChild("ColorFrameListView", true);
     ListView@ lv = particleEffectWindow.GetChild("ColorFrameListView", true);
-    if (lv !is null && lv.selection != M_MAX_UNSIGNED )
+    if (lv !is null && lv.selection != M_MAX_UNSIGNED)
     {
     {
         BeginParticleEffectEdit();
         BeginParticleEffectEdit();
         
         
@@ -234,7 +232,7 @@ void EditParticleEffectTextureFrameRemove(StringHash eventType, VariantMap& even
         return;
         return;
 
 
     ListView@ lv = particleEffectWindow.GetChild("TextureFrameListView", true);
     ListView@ lv = particleEffectWindow.GetChild("TextureFrameListView", true);
-    if (lv !is null && lv.selection != M_MAX_UNSIGNED )
+    if (lv !is null && lv.selection != M_MAX_UNSIGNED)
     {
     {
         BeginParticleEffectEdit();
         BeginParticleEffectEdit();
         
         
@@ -1483,14 +1481,14 @@ void ResizeParticleEffectPreview(StringHash eventType, VariantMap& eventData)
     float aspectRatio = width / height;
     float aspectRatio = width / height;
     particlePreviewCamera.aspectRatio = aspectRatio;
     particlePreviewCamera.aspectRatio = aspectRatio;
 
 
-    gizmo_offset_x = gizmo_offset;
-    gizmo_offset_y = 1.0f - gizmo_offset * aspectRatio;
+    gizmoOffsetX = gizmoOffset;
+    gizmoOffsetY = 1.0f - gizmoOffset * aspectRatio;
 
 
     if(width > height)
     if(width > height)
     {
     {
         aspectRatio = height / width;
         aspectRatio = height / width;
-        gizmo_offset_y = 1.0f - gizmo_offset;
-        gizmo_offset_x = gizmo_offset * aspectRatio;
+        gizmoOffsetY = 1.0f - gizmoOffset;
+        gizmoOffsetX = gizmoOffset * aspectRatio;
     }
     }
 
 
     SetGizmoPosition();
     SetGizmoPosition();