Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Aug 1, 2011, 4:37:38 PM (13 years ago)
Author:
landauf
Message:

Replaced COUT() with orxout() in tools and orxonox library. Requires quite some fine-tuning.

Location:
code/branches/output/src/libraries/tools
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • code/branches/output/src/libraries/tools/BillboardSet.cc

    r6417 r8809  
    8080        catch (...)
    8181        {
    82             COUT(1) << "Error: Couln't load billboard \"" << file << '"' << std::endl;
     82            orxout(internal_error) << "Couldn't load billboard \"" << file << '"' << endl;
    8383            this->billboardSet_ = 0;
    8484        }
     
    103103        catch (...)
    104104        {
    105             COUT(1) << "Error: Couln't load billboard \"" << file << '"' << std::endl;
     105            orxout(internal_error) << "Couldn't load billboard \"" << file << '"' << endl;
    106106            this->billboardSet_ = 0;
    107107        }
  • code/branches/output/src/libraries/tools/Mesh.cc

    r8351 r8809  
    7272            catch (...)
    7373            {
    74                 COUT(1) << "Error: Couln't load mesh \"" << meshsource << '"' << std::endl;
     74                orxout(internal_error) << "Couldn't load mesh \"" << meshsource << '"' << endl;
    7575                this->entity_ = 0;
    7676            }
  • code/branches/output/src/libraries/tools/ParticleInterface.cc

    r7166 r8809  
    7878            catch (...)
    7979            {
    80                 COUT(1) << "Error: Couln't load particle system \"" << templateName << '"' << std::endl;
     80                orxout(internal_error) << "Couldn't load particle system \"" << templateName << '"' << endl;
    8181                this->particleSystem_ = 0;
    8282            }
  • code/branches/output/src/libraries/tools/ResourceCollection.cc

    r8351 r8809  
    6262        if (resourceGroup.empty())
    6363        {
    64             COUT(2) << "Warning: \"\" is not a valid resource group." << std::endl;
     64            orxout(internal_warning) << "\"\" is not a valid resource group." << endl;
    6565            return;
    6666        }
  • code/branches/output/src/libraries/tools/ResourceLocation.cc

    r8366 r8809  
    8080        else
    8181        {
    82             COUT(2) << "Warning: ResourceLocation '" << this->getPath() << "' does not seem to exist" << std::endl;
     82            orxout(internal_warning) << "ResourceLocation '" << this->getPath() << "' does not seem to exist" << endl;
    8383            return;
    8484        }
     
    101101        catch (const Ogre::Exception& ex)
    102102        {
    103             COUT(1) << "Removing of a ResourceLocation failed: " << ex.what() << std::endl;
     103            orxout(internal_error) << "Removing of a ResourceLocation failed: " << ex.what() << endl;
    104104        }
    105105    }
  • code/branches/output/src/libraries/tools/Shader.cc

    r8079 r8809  
    141141                }
    142142                else
    143                     COUT(2) << "Warning: Couldn't load compositor with name \"" << this->compositorName_ << "\"." << std::endl;
     143                    orxout(internal_warning) << "Couldn't load compositor with name \"" << this->compositorName_ << "\"." << endl;
    144144            }
    145145            this->oldcompositorName_ = this->compositorName_;
     
    217217                }
    218218                else
    219                     COUT(2) << "Warning: No pass " << it->pass_ << " in technique " << it->technique_ << " in compositor \"" << this->compositorName_ << "\" or pass has no shader." << std::endl;
     219                    orxout(internal_warning) << "No pass " << it->pass_ << " in technique " << it->technique_ << " in compositor \"" << this->compositorName_ << "\" or pass has no shader." << endl;
    220220            }
    221221            else
    222                 COUT(2) << "Warning: No technique " << it->technique_ << " in compositor \"" << this->compositorName_ << "\" or technique has no pass with shader." << std::endl;
     222                orxout(internal_warning) << "No technique " << it->technique_ << " in compositor \"" << this->compositorName_ << "\" or technique has no pass with shader." << endl;
    223223        }
    224224        this->parameters_.clear();
  • code/branches/output/src/libraries/tools/Timer.h

    r8729 r8809  
    6666    void MyClass::myFunction()
    6767    {
    68         COUT(0) << "Hello World" << std::endl;
     68        orxout() << "Hello World" << endl;
    6969    }
    7070    @endcode
Note: See TracChangeset for help on using the changeset viewer.