~ubuntu-branches/ubuntu/raring/openwalnut/raring

« back to all changes in this revision

Viewing changes to src/modules/data/WMData.cpp

  • Committer: Package Import Robot
  • Author(s): Sebastian Eichelbaum
  • Date: 2012-12-12 11:26:32 UTC
  • mfrom: (3.1.1 sid)
  • Revision ID: package-import@ubuntu.com-20121212112632-xhiuwkxuz5h0idkh
Tags: 1.3.1+hg5849-1
* Minor changes compared to 1.3.0 but included several bug fixes.
* See http://www.openwalnut.org/versions/4

Show diffs side-by-side

added added

removed removed

Lines of Context:
222
222
                {
223
223
                    case W_DT_UNSIGNED_CHAR:
224
224
                    case W_DT_INT16:
 
225
                    case W_DT_UINT16:
 
226
                    case W_DT_UINT32:
225
227
                    case W_DT_SIGNED_INT:
226
228
                        m_dataSet->getTexture()->colormap()->set(
227
229
                            m_dataSet->getTexture()->colormap()->get().newSelector( WItemSelector::IndexList( 1, 0 ) )
244
246
                        }
245
247
                        break;
246
248
                    default:
247
 
                        WAssert( false, "Unknow data type in Data module" );
 
249
                        WAssert( false, "Could not load \"" + fileName + "\". Reason: unknown data type in Data module" );
248
250
                }
249
251
            }
250
252
        }
278
280
    }
279
281
    else
280
282
    {
281
 
        throw WDHException( std::string( "Unknown file type: '" + suffix + "'" ) );
 
283
        throw WDHException( std::string( "Could not load \"" + fileName + "\". Reason: unknown file type: \"" + suffix + "\"" ) );
282
284
    }
283
285
 
284
286
    debugLog() << "Loading data done.";
293
295
    // textures also provide properties
294
296
    if( m_dataSet->isTexture() )
295
297
    {
296
 
        WGEColormapping::registerTexture( m_dataSet->getTexture(), m_runtimeName->get() );
 
298
        if( !getSuppressColormaps() )
 
299
        {
 
300
            WGEColormapping::registerTexture( m_dataSet->getTexture(), m_runtimeName->get() );
 
301
        }
297
302
        m_properties->addProperty( m_dataSet->getTexture()->getProperties() );
298
303
        m_infoProperties->addProperty( m_dataSet->getTexture()->getInformationProperties() );
299
304
    }
356
361
 
357
362
                if( m_isTexture )
358
363
                {
359
 
                    WGEColormapping::registerTexture( m_dataSet->getTexture(), m_runtimeName->get() );
 
364
                    if( !getSuppressColormaps() )
 
365
                    {
 
366
                        WGEColormapping::registerTexture( m_dataSet->getTexture(), m_runtimeName->get() );
 
367
                    }
360
368
                    m_properties->addProperty( m_dataSet->getTexture()->getProperties() );
361
369
                    m_infoProperties->addProperty( m_dataSet->getTexture()->getInformationProperties() );
362
370
                }