* added small arrow next to pickWorldButton

* changed Base property from setBaseButton to pickWorldButton
fiezi · Dec 15, 2011 · 6d99520 · 6d99520
1 parent d4619c9
commit 6d99520
Show file tree

Hide file tree

Showing 10 changed files with 1,531 additions and 1,478 deletions.
diff --git a/Moviesandbox.exe b/Moviesandbox.exe
diff --git a/classes/actor.cpp b/classes/actor.cpp
@@ -150,7 +150,7 @@ createMemberID("PIVOTLOCATION", &pivotLocation, this,true,"17VectorInputButton")
 createMemberID("TRANSFORMMATRIX",&transformMatrix,this,true);
 createMemberID("SCALEMATRIX",&scaleMatrix,this,false);
 
-createMemberID("BASE",&base,this,true,"13SetBaseButton");
+createMemberID("BASE",&base,this,true,"15PickWorldButton");
 createMemberID("BASEMATRIX",&baseMatrix,this,false);
 createMemberID("BASENODE",&baseNode, this,false);
 

diff --git a/classes/character.cpp b/classes/character.cpp
@@ -70,7 +70,7 @@ void Character::registerProperties(){
     SkeletalActor::registerProperties();
     createMemberID("IDLEACTIONNAME",&idleActionName,this);
     createMemberID("IDLEANIMTIMESCALE",&idleAnimTimeScale,this);
-    createMemberID("WALKTARGET",&walkTarget,this);
+    createMemberID("WALKTARGET",&walkTarget,this,"15PickWorldButton");
     createMemberID("LOOKTARGET",&lookTarget,this);
     createMemberID("WALKSPEED",&walkSpeed,this);
     createMemberID("TURNSPEED",&turnSpeed,this);

diff --git a/classes/pickWorldButton.cpp b/classes/pickWorldButton.cpp
@@ -12,6 +12,22 @@ void PickWorldButton::setup(){
     BasicButton::setup();
 
 }
+
+
+void PickWorldButton::drawPlane(){
+
+        float oldScaleX= scale.x;
+        scale.x-=18;
+        BasicButton::drawPlane();
+        scale.x=oldScaleX;
+
+        Vector4f tfColor=color;
+        renderer->setupShading("buttonTexture");
+        renderer->setupTexturing("icon_pickWorld",this);
+
+        //draw a little square right next to the button
+        renderer->drawPlane(scale.x -16.0,0.0,scale.x,scale.y, color );
+}
 
 void PickWorldButton::update(double deltaTime){
 

diff --git a/classes/pickWorldButton.h b/classes/pickWorldButton.h
@@ -11,6 +11,7 @@ class PickWorldButton: public BasicButton{
     virtual ~PickWorldButton();
 
     virtual void setup();
+    virtual void drawPlane();
     virtual void update(double deltaTime);
 
     virtual void mouseOver();

diff --git a/classes/setBaseButton.cpp b/classes/setBaseButton.cpp
@@ -19,8 +19,8 @@ void SetBaseButton::update(double deltaTime){
 
     BasicButton::update(deltaTime);
 }
-
-void SetBaseButton::mouseOver(){
+
+ void SetBaseButton::mouseOver(){
 
     BasicButton::mouseOver();
     if ( ((Actor*)parent)->base){

diff --git a/resources/basic.library b/resources/basic.library
@@ -18,6 +18,7 @@
 
     <Texture textureID="icon_base" filename="icon_base.tga" bAlpha="1" bWrap="0" />
     <Texture textureID="icon_setBase" filename="icon_setBase.tga" bAlpha="1" bWrap="0" />
+    <Texture textureID="icon_pickWorld" filename="icon_pickWorld.tga" bAlpha="1" bWrap="0" />
     <Texture textureID="icon_select" filename="icon_select.tga" bAlpha="1" bWrap="0" />
     <Texture textureID="icon_advanced" filename="icon_advanced.tga" bAlpha="1" bWrap="0"/>
 

diff --git a/resources/icons/icon_pickWorld.tga b/resources/icons/icon_pickWorld.tga
diff --git a/resources/icons/moviesandboxIcons_vallejo.ai b/resources/icons/moviesandboxIcons_vallejo.ai
diff --git a/resources/icons/msbIcons_vallejo.psd b/resources/icons/msbIcons_vallejo.psd