Skip to content
Browse files

* release candidate 1

  • Loading branch information...
1 parent 396bc62 commit f6c2cf05938a228afa45185f12b58f8694dafeb4 @fiezi committed Dec 15, 2011
View
BIN Moviesandbox.exe
Binary file not shown.
View
6 classes/boneWidget.cpp
@@ -9,7 +9,7 @@
BoneWidget::BoneWidget(){
name="boneWidget";
-tooltip="bones";
+tooltip="bones (x)";
bWidgetOpen=false;
listColor=Vector4f(0.8,0.8,0.8,1.0);
@@ -47,12 +47,12 @@ void BoneWidget::closeWidget(){
void BoneWidget::trigger(MsbObject* other){
- if (other->name=="Paint Weights (z)"){
+ if (other->name=="Paint Weights"){
useTool=TOOL_SKIN;
setTextureID("icon_paintWeights");
}
- if (other->name=="Create Bone (x)"){
+ if (other->name=="Create Bone"){
useTool=TOOL_BONE;
setTextureID("icon_addBones");
}
View
59 classes/content.cpp
@@ -335,14 +335,9 @@ void Content::createDrawWidget(int x, int y){
lbut->setup();
sceneData->buttonList.push_back(lbut);
-/*
- lbut->listType.push_back("15PickWorldButton");
- lbut->listName.push_back("New Drawing");
- lbut->listProp.push_back("NULL");
- lbut->listIcon.push_back("icon_new");
-*/
+
lbut->listType.push_back("12AssignButton");
- lbut->listName.push_back("Draw Particles (b)");
+ lbut->listName.push_back("Draw Particles");
lbut->listProp.push_back("NULL");
lbut->listIcon.push_back("icon_paint");
@@ -355,52 +350,6 @@ void Content::createDrawWidget(int x, int y){
lbut->listName.push_back("Draw Meshes");
lbut->listProp.push_back("NULL");
lbut->listIcon.push_back("icon_drawMesh");
-
-
-/*
- lbut->listType.push_back("15PickWorldButton");
- lbut->listName.push_back("Select Drawing");
- lbut->listProp.push_back("NULL");
- lbut->listIcon.push_back("icon_selectDrawing");
-
- lbut->listType.push_back("12AssignButton");
- lbut->listName.push_back("Select Particles");
- lbut->listProp.push_back("NULL");
- lbut->listIcon.push_back("icon_selectParticles");
-
-
- lbut->listType.push_back("12AssignButton");
- lbut->listName.push_back("merge Drawings");
- lbut->listProp.push_back("NULL");
- lbut->listIcon.push_back("icon_mergeDrawings");
-
-
- lbut->listType.push_back("12AssignButton");
- lbut->listName.push_back("scaleZ x2");
- lbut->listProp.push_back("NULL");
- lbut->listIcon.push_back("icon_grow");
-
- lbut->listType.push_back("12AssignButton");
- lbut->listName.push_back("scaleZ x0.5");
- lbut->listProp.push_back("NULL");
- lbut->listIcon.push_back("icon_shrink");
-
- lbut->listType.push_back("12AssignButton");
- lbut->listName.push_back("save");
- lbut->listProp.push_back("NULL");
- lbut->listIcon.push_back("icon_save");
-
- lbut->listType.push_back("15TextInputButton");
- lbut->bDrawName=false;
- lbut->listName.push_back("save As...");
- lbut->listProp.push_back("NULL");
- lbut->listIcon.push_back("icon_saveAs");
-
- lbut->listType.push_back("12AssignButton");
- lbut->listName.push_back("clear Drawing");
- lbut->listProp.push_back("NULL");
- lbut->listIcon.push_back("icon_clearDrawing");
-*/
}
void Content::createBoneWidget(int x, int y){
@@ -419,13 +368,13 @@ void Content::createBoneWidget(int x, int y){
//this way, we create new bones by clicking!
lbut->listType.push_back("12AssignButton");
- lbut->listName.push_back("Create Bone (x)");
+ lbut->listName.push_back("Create Bone");
lbut->listProp.push_back("NULL");
lbut->listIcon.push_back("icon_addBones");
//here, we skin bones
lbut->listType.push_back("12AssignButton");
- lbut->listName.push_back("Paint Weights (z)");
+ lbut->listName.push_back("Paint Weights");
lbut->listProp.push_back("NULL");
lbut->listIcon.push_back("icon_paintWeights");
View
2 classes/drawTool.cpp
@@ -17,7 +17,7 @@ DrawTool::DrawTool(){
bPaintMesh=false;
bJustCreated=false;
- highlightBtn="Draw Particles (b)";
+ highlightBtn="Draw Particles";
}
DrawTool::~DrawTool(){}
View
2 classes/drawingWidget.cpp
@@ -62,7 +62,7 @@ void DrawingWidget::closeWidget(){
///creates new drawing here!
void DrawingWidget::trigger(MsbObject* other){
- if (other->name=="Draw Particles (b)"){
+ if (other->name=="Draw Particles"){
useTool=TOOL_DRAW;
sceneData->drawTool->bPaintMesh=false;
sceneData->brush->drawType=DRAW_SPRITE;
View
6 projects/emptyProject/my.project
@@ -1,7 +1,9 @@
<?xml version="1.0" ?>
<Moviesandbox>
- <untitled amount="5" />
- <StartScene name="blank.scene" />
+ <untitled amount="7" />
+ <StartScene name="character.scene" />
+ <SpriteMesh meshID="greg" meshFilename="C:/Moviesandbox/projects/emptyProject/greg.spriteMesh" />
+ <SpriteMesh meshID="untitled6" meshFilename="untitled/untitled6.spriteMesh" />
<SpriteMesh meshID="chair" meshFilename="C:/Moviesandbox/projects/emptyProject/chair.spriteMesh" />
<SpriteMesh meshID="untitled1" meshFilename="untitled/untitled1.spriteMesh" />
<SpriteMesh meshID="untitled4" meshFilename="untitled/untitled4.spriteMesh" />

0 comments on commit f6c2cf0

Please sign in to comment.
Something went wrong with that request. Please try again.