* fixed actorGizmo location calculation

* fixed brushPreview flickering and not displaying intensity
fiezi · Dec 15, 2011 · bad8418 · bad8418
1 parent 9c0effe
commit bad8418
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/Moviesandbox.exe b/Moviesandbox.exe
diff --git a/classes/actorGizmo.cpp b/classes/actorGizmo.cpp
@@ -215,12 +215,12 @@ void ActorGizmo::update(double deltaTime){
         zRotateGizmo->bHidden=false;
 
         //this should be in between all actors...
-        Vector3f centerLocation;
+        Matrix4f centerLocation;
         Vector3f centerAxisX,centerAxisY,centerAxisZ;
         Vector3f centerScale;
 
         for (int i=0;i<(int)sceneData->selectedActors.size();i++){
-            centerLocation+=sceneData->selectedActors[i]->location;
+            centerLocation=centerLocation * sceneData->selectedActors[i]->baseMatrix;
             centerAxisX+=sceneData->selectedActors[i]->xAxis;
             centerAxisY+=sceneData->selectedActors[i]->yAxis;
             centerAxisZ+=sceneData->selectedActors[i]->zAxis;
@@ -229,16 +229,13 @@ void ActorGizmo::update(double deltaTime){
 
         centerLocation=centerLocation * 1.0/(float)(sceneData->selectedActors.size());
         centerScale=centerScale * 1.0/(float)(sceneData->selectedActors.size());
-        centerAxisX=centerAxisX * 1.0/(float)(sceneData->selectedActors.size());
-        centerAxisY=centerAxisY * 1.0/(float)(sceneData->selectedActors.size());
-        centerAxisZ=centerAxisZ * 1.0/(float)(sceneData->selectedActors.size());
 
         centerAxisX.normalize();
         centerAxisY.normalize();
         centerAxisZ.normalize();
 
 
-        setLocation(centerLocation);
+        setLocation(centerLocation.getTranslation());
         setRotation(centerAxisX,centerAxisY,centerAxisZ);
         setScale(centerScale);
 

diff --git a/classes/brushInspector.cpp b/classes/brushInspector.cpp
@@ -249,9 +249,10 @@ void BrushInspector::trigger(MsbObject* other){
     //update brush preview
      brushViz->buttonColor=sceneData->brush->color;
      brushViz->mouseOverColor=sceneData->brush->color;
-     brushViz->color.a=sceneData->brush->intensity+ 0.1;
+     brushViz->buttonColor.a=sceneData->brush->intensity+ 0.1;
+     brushViz->mouseOverColor.a=sceneData->brush->intensity+ 0.1;
      brushViz->scale.x=sceneData->brush->scale.x * 10.0 + 10.0;
-     brushViz->scale.y=sceneData->brush->scale.x * 5.0 +10.0;
+     brushViz->scale.y=sceneData->brush->scale.x * 10.0 +10.0;
 
 }