Changeset 8602

Show
Ignore:
Timestamp:
07/16/08 00:30:51
Author:
robert
Message:

From Jeremy Moles, Updated file references to reflect new data in OpenSceneGraph-Data

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • OpenSceneGraph/trunk/examples/osgwidgetaddremove/osgwidgetaddremove.cpp

    r8600 r8602  
    1414    ABCWidget(const std::string& label): 
    1515    osgWidget::Label("", label) { 
    16         setFont("fonts/Calibri1.ttf"); 
     16        setFont("fonts/Vera.ttf"); 
    1717        setFontSize(20); 
    1818        setCanFill(true); 
    …… 
    2626    Button(const std::string& label): 
    2727    osgWidget::Label("", label) { 
    28         setFont("fonts/Calibri1.ttf"); 
     28        setFont("fonts/Vera.ttf"); 
    2929        setFontSize(30); 
    3030        setColor(0.8f, 0.2f, 0.2f, 0.8f); 

  • OpenSceneGraph/trunk/examples/osgwidgetframe/osgwidgetframe.cpp

    r8600 r8602  
    5555    osgWidget::Widget* b = frame->getBorder(osgWidget::Frame::BORDER_BOTTOM); 
    5656 
    57     l->setImage("../examples/osgwidgetframe/images/border-left.tga", true); 
    58     r->setImage("../examples/osgwidgetframe/images/border-right.tga", true); 
    59     t->setImage("../examples/osgwidgetframe/images/border-top.tga", true); 
    60     b->setImage("../examples/osgwidgetframe/images/border-bottom.tga", true); 
     57    l->setImage("osgWidget/border-left.tga", true); 
     58    r->setImage("osgWidget/border-right.tga", true); 
     59    t->setImage("osgWidget/border-top.tga", true); 
     60    b->setImage("osgWidget/border-bottom.tga", true); 
    6161 
    6262    l->setTexCoordWrapVertical(); 
    …… 
    7070    osgWidget::Widget* right  = new osgWidget::Widget("right", 512.0f, 256.0f); 
    7171 
    72     left->setImage("../examples/osgwidgetframe/images/panel-left.tga", true); 
    73     center->setImage("../examples/osgwidgetframe/images/panel-center.tga", true); 
    74     right->setImage("../examples/osgwidgetframe/images/panel-right.tga", true); 
     72    left->setImage  ("osgWidget/panel-left.tga", true); 
     73    center->setImage("osgWidget/panel-center.tga", true); 
     74    right->setImage ("osgWidget/panel-right.tga", true); 
    7575 
    7676    center->setTexCoordWrapHorizontal(); 

  • OpenSceneGraph/trunk/examples/osgwidgetinput/osgwidgetinput.cpp

    r8600 r8602  
    2323    label->setFontSize(16); 
    2424    label->setFontColor(1.0f, 1.0f, 1.0f, 1.0f); 
    25     // label->setFont("fonts/monospace.ttf"); 
    26     label->setFont("fonts/Calibri1.ttf"); 
     25    label->setFont("fonts/Vera.ttf"); 
    2726    label->setPadding(2.0f); 
    2827    label->setHeight(18.0f); 

  • OpenSceneGraph/trunk/examples/osgwidgetlabel/osgwidgetlabel.cpp

    r8600 r8602  
    2626    osgWidget::Label* label = new osgWidget::Label("", ""); 
    2727 
    28     label->setFont("fonts/arial.ttf"); 
     28    label->setFont("fonts/Vera.ttf"); 
    2929    label->setFontSize(size); 
    3030    label->setFontColor(1.0f, 1.0f, 1.0f, 1.0f); 

  • OpenSceneGraph/trunk/examples/osgwidgetmenu/osgwidgetmenu.cpp

    r8600 r8602  
    1818    ColorLabel(const char* label): 
    1919    osgWidget::Label("", "") { 
    20         setFont("fonts/Calibri1.ttf"); 
     20        setFont("fonts/Vera.ttf"); 
    2121        setFontSize(14); 
    2222        setFontColor(1.0f, 1.0f, 1.0f, 1.0f); 

  • OpenSceneGraph/trunk/examples/osgwidgetnotebook/osgwidgetnotebook.cpp

    r8600 r8602  
    5050            osgWidget::Label* label1 = new osgWidget::Label(ss.str()); 
    5151 
    52             label1->setFont("fonts/monospace.ttf"); 
     52            label1->setFont("fonts/VeraMono.ttf"); 
    5353            label1->setFontSize(20); 
    5454            label1->setFontColor(1.0f, 1.0f, 1.0f, 1.0f); 
    …… 
    7474            osgWidget::Label* label2 = new osgWidget::Label(ss.str()); 
    7575 
    76             label2->setFont("fonts/monospace.ttf"); 
     76            label2->setFont("fonts/Vera.ttf"); 
    7777            label2->setFontSize(15); 
    7878            label2->setFontColor(1.0f, 1.0f, 1.0f, 1.0f); 
    …… 
    9494        osgWidget::Label* label = new osgWidget::Label("label"); 
    9595 
    96         label->setFont("fonts/monospace.ttf"); 
     96        label->setFont("fonts/arial.ttf"); 
    9797        label->setFontSize(15); 
    9898        label->setFontColor(1.0f, 1.0f, 1.0f, 1.0f); 

  • OpenSceneGraph/trunk/examples/osgwidgetscrolled/osgwidgetscrolled.cpp

    r8600 r8602  
    8989    osgWidget::Frame* frame = osgWidget::Frame::createSimpleFrameWithSingleTexture( 
    9090        "frame", 
    91         "../examples/osgwidgetscrolled/theme-2.png", 
     91        "osgWidget/theme-2.png", 
    9292        64.0f, 
    9393        64.0f, 
    …… 
    102102    // This is our Transformers box. :) 
    103103    osgWidget::Box*    box  = new osgWidget::Box("images", osgWidget::Box::VERTICAL); 
    104     osgWidget::Widget* img1 = new osgWidget::Widget("im1", 256.0f, 256.0f); 
    105     osgWidget::Widget* img2 = new osgWidget::Widget("im2", 256.0f, 256.0f); 
    106     osgWidget::Widget* img3 = new osgWidget::Widget("im3", 256.0f, 256.0f); 
    107     osgWidget::Widget* img4 = new osgWidget::Widget("im4", 256.0f, 256.0f); 
     104    osgWidget::Widget* img1 = new osgWidget::Widget("im1", 512.0f, 512.0f); 
     105    osgWidget::Widget* img2 = new osgWidget::Widget("im2", 512.0f, 512.0f); 
     106    osgWidget::Widget* img3 = new osgWidget::Widget("im3", 512.0f, 512.0f); 
     107    osgWidget::Widget* img4 = new osgWidget::Widget("im4", 512.0f, 512.0f); 
    108108 
    109     img1->setImage("../examples/osgwidgetscrolled/images/starscream.jpg", true); 
    110     img2->setImage("../examples/osgwidgetscrolled/images/optimus.jpg", true); 
    111     img3->setImage("../examples/osgwidgetscrolled/images/megatron.jpg", true); 
    112     img4->setImage("../examples/osgwidgetscrolled/images/bumblebee.jpg", true); 
     109    img1->setImage("osgWidget/scrolled1.jpg", true); 
     110    img2->setImage("osgWidget/scrolled2.jpg", true); 
     111    img3->setImage("osgWidget/scrolled3.jpg", true); 
     112    img4->setImage("osgWidget/scrolled4.jpg", true); 
    113113 
    114114    img1->setMinimumSize(10.0f, 10.0f); 

  • OpenSceneGraph/trunk/examples/osgwidgetshader/osgwidgetshader.cpp

    r8600 r8602  
    22// $Id: osgwidgetshader.cpp 28 2008-03-26 15:26:48Z cubicool $ 
    33 
     4#include <osgDB/FileUtils> 
    45#include <osgWidget/Util> 
    56#include <osgWidget/WindowManager> 
    …… 
    6162    program->addShader(osg::Shader::readShaderFile( 
    6263        osg::Shader::VERTEX, 
    63         "osgWidget/osgwidgetshader-vert.glsl" 
     64        osgDB::findDataFile("osgWidget/osgwidgetshader-vert.glsl") 
    6465    )); 
    6566     
    6667    program->addShader(osg::Shader::readShaderFile( 
    6768        osg::Shader::FRAGMENT, 
    68         "osgWidget/osgwidgetshader-frag.glsl" 
     69        osgDB::findDataFile("osgWidget/osgwidgetshader-frag.glsl") 
    6970    )); 
    7071