FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Checked in Pavel's updates for non texured surfaces.

Browse Source
This commit is contained in:
Robert Osfield
2002-07-28 23:27:21 +00:00
parent 05472135b0
commit 02bb66a572
6 changed files with 419 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files

351
src/osgPlugins/lwo/Lwo2.cpp
View File

@@ -1,9 +1,37 @@
/*
* Lightwave Object version 2 loader for Open Scene Graph
* Version 2 introduced in Lightwave v6.0
*
* Copyright (C) 2002 Pavel Moloshtan <pasha@moloshtan.com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* The Open Scene Graph (OSG) is a cross platform C++/OpenGL library for
* real-time rendering of large 3D photo-realistic models.
* The OSG homepage is http://www.openscenegraph.org/
*/
#include <iostream>
#include <fstream>
#include <osg/Notify>
#include <osg/Geode>
#include <osg/Group>
#include <osg/Texture>
#include <osg/Material>
#include <osg/CullFace>
#include <osgDB/Registry>
#include <osgDB/ReadFile>
@@ -13,6 +41,7 @@
Lwo2::Lwo2()
{
_successfully_read = false;
};
Lwo2::~Lwo2()
@@ -88,49 +117,49 @@ Lwo2::ReadFile( const string& filename )
if (current_tag_name == tag_TAGS)
{
_read_tag_strings(current_tag_size);
_read_tag_strings(current_tag_size);
}
else if (current_tag_name == tag_LAYR)
{
_read_layer(current_tag_size);
_read_layer(current_tag_size);
}
else if (current_tag_name == tag_PNTS)
{
_read_points(current_tag_size);
_read_points(current_tag_size);
}
else if (current_tag_name == tag_VMAP)
{
_read_vertex_mapping(current_tag_size);
_read_vertex_mapping(current_tag_size);
}
else if (current_tag_name == tag_VMAD)
{
_read_polygons_mapping(current_tag_size);
_read_polygons_mapping(current_tag_size);
}
else if (current_tag_name == tag_POLS)
{
_read_polygons(current_tag_size);
_read_polygons(current_tag_size);
}
else if (current_tag_name == tag_PTAG)
{
_read_polygon_tag_mapping(current_tag_size);
_read_polygon_tag_mapping(current_tag_size);
}
else if (current_tag_name == tag_CLIP)
{
_read_image_definition(current_tag_size);
_read_image_definition(current_tag_size);
}
else if (current_tag_name == tag_SURF)
{
_read_surface(current_tag_size);
_read_surface(current_tag_size);
}
else
{
_fin.seekg(current_tag_size + current_tag_size % 2, ios::cur);
_fin.seekg(current_tag_size + current_tag_size % 2, ios::cur);
}
}
_fin.close();
return true;
return _successfully_read = true;
}
unsigned char
@@ -192,23 +221,23 @@ Lwo2::_read_string(string& str)
void
Lwo2::_print_tag(unsigned int tag, unsigned int size) {
notify(DEBUG_INFO) << "Found tag "
<< char(tag >> 24)
<< char(tag >> 16)
<< char(tag >> 8)
<< char(tag)
<< " size " << size << " bytes"
<< endl;
<< char(tag >> 24)
<< char(tag >> 16)
<< char(tag >> 8)
<< char(tag)
<< " size " << size << " bytes"
<< endl;
}
// print 4-char type
void
Lwo2::_print_type(unsigned int type) {
notify(DEBUG_INFO) << " type \t"
<< char(type >> 24)
<< char(type >> 16)
<< char(type >> 8)
<< char(type)
<< endl;
<< char(type >> 24)
<< char(type >> 16)
<< char(type >> 8)
<< char(type)
<< endl;
}
// read TAGS info
@@ -286,19 +315,19 @@ Lwo2::_read_polygons(unsigned long size)
unsigned short vertex_count;
while (size > 0)
{
vertex_count = _read_short() & 0x03FF;
size -= 2;
{
vertex_count = _read_short() & 0x03FF;
size -= 2;
PointsList* points_list = new PointsList;
_current_layer->_polygons.push_back(points_list);
while (vertex_count--)
{
points_list->push_back(_read_short());
size -= 2;
}
}
while (vertex_count--)
{
points_list->push_back(_read_short());
size -= 2;
}
}
}
else
{
@@ -338,12 +367,12 @@ Lwo2::_read_vertex_mapping(unsigned long size)
float u;
float v;
while (count--)
{
n = _read_short();
u = _read_float();
v = _read_float();
_current_layer->_points_map[n].set(u, v);
}
{
n = _read_short();
u = _read_float();
v = _read_float();
_current_layer->_points_map[n].set(u, v);
}
}
else
{
@@ -352,7 +381,7 @@ Lwo2::_read_vertex_mapping(unsigned long size)
notify(DEBUG_INFO) << " skipping..." << endl;
_fin.seekg(size + size % 2, ios::cur);
}
}
// read VMAD info
@@ -385,16 +414,16 @@ Lwo2::_read_polygons_mapping(unsigned long size)
float u;
float v;
while (count--)
{
point_index = _read_short();
polygon_index = _read_short();
u = _read_float();
v = _read_float();
{
point_index = _read_short();
polygon_index = _read_short();
u = _read_float();
v = _read_float();
Lwo2PolygonMapping pm(polygon_index, Vec2(u, v));
_current_layer->_polygons_map.insert(PairVMAD(point_index, pm));
Lwo2PolygonMapping pm(polygon_index, Vec2(u, v));
_current_layer->_polygons_map.insert(PairVMAD(point_index, pm));
}
}
}
else
{
@@ -403,7 +432,7 @@ Lwo2::_read_polygons_mapping(unsigned long size)
notify(DEBUG_INFO) << " skipping..." << endl;
_fin.seekg(size + size % 2, ios::cur);
}
}
// read PTAG info
@@ -425,11 +454,11 @@ Lwo2::_read_polygon_tag_mapping(unsigned long size)
short tag_index;
while (count--)
{
polygon_index = _read_short();
tag_index = _read_short();
_current_layer->_polygons_tag[polygon_index] = tag_index;
}
{
polygon_index = _read_short();
tag_index = _read_short();
_current_layer->_polygons_tag[polygon_index] = tag_index;
}
}
else
{
@@ -465,14 +494,14 @@ Lwo2::_read_image_definition(unsigned long size)
string name;
_read_string(name);
size -= name.length() + name.length() % 2;
if (index + 1 > _images.size())
{
_images.resize(index + 1);
}
{
_images.resize(index + 1);
}
_images[index] = name.c_str();
notify(DEBUG_INFO) << " name \t'" << name << "'" << endl;
}
}
@@ -483,6 +512,8 @@ void
Lwo2::_read_surface(unsigned long size)
{
Lwo2Surface* surface = new Lwo2Surface();
surface->image_index = -1;
surface->state_set = NULL;
_read_string(surface->name);
size -= surface->name.length() + surface->name.length() % 2;
@@ -496,7 +527,7 @@ Lwo2::_read_surface(unsigned long size)
unsigned long current_tag_name;
unsigned short current_tag_size;
while (size > 0)
while (size > 0 && !_fin.eof())
{
current_tag_name = _read_long();
size -= 4;
@@ -506,63 +537,74 @@ Lwo2::_read_surface(unsigned long size)
_print_tag(current_tag_name, current_tag_size);
if (current_tag_name == tag_BLOK)
{
{
// BLOK
int blok_size = current_tag_size;
size -= blok_size;
while (blok_size > 0)
{
current_tag_name = _read_long();
blok_size -= 4;
current_tag_size = _read_short();
blok_size -= 2;
notify(DEBUG_INFO) << " ";
_print_tag(current_tag_name, current_tag_size);
// BLOK
int blok_size = current_tag_size;
size -= blok_size;
while (blok_size > 0)
{
current_tag_name = _read_long();
blok_size -= 4;
current_tag_size = _read_short();
blok_size -= 2;
notify(DEBUG_INFO) << " ";
_print_tag(current_tag_name, current_tag_size);
if (current_tag_name == tag_IMAG)
{
surface->image_index = _read_short();
notify(DEBUG_INFO) << " image index\t" << surface->image_index << endl;
blok_size -= 2;
}
else if (current_tag_name == tag_IMAP)
{
if (current_tag_name == tag_IMAG)
{
surface->image_index = _read_short();
notify(DEBUG_INFO) << " image index\t" << surface->image_index << endl;
blok_size -= 2;
}
else if (current_tag_name == tag_IMAP)
{
// IMAP
int imap_size = current_tag_size;
blok_size -= imap_size;
// IMAP
int imap_size = current_tag_size;
blok_size -= imap_size;
string ordinal;
_read_string(ordinal);
imap_size -= ordinal.length() + ordinal.length() % 2;
notify(DEBUG_INFO) << " ordinal \t'" << ordinal << "'" << endl;
string ordinal;
_read_string(ordinal);
imap_size -= ordinal.length() + ordinal.length() % 2;
notify(DEBUG_INFO) << " ordinal \t'" << ordinal << "'" << endl;
while(imap_size > 0)
{
current_tag_name = _read_long();
imap_size -= 4;
current_tag_size = _read_short();
imap_size -= 2;
notify(DEBUG_INFO) << " ";
_print_tag(current_tag_name, current_tag_size);
while(imap_size > 0)
{
current_tag_name = _read_long();
imap_size -= 4;
current_tag_size = _read_short();
imap_size -= 2;
notify(DEBUG_INFO) << " ";
_print_tag(current_tag_name, current_tag_size);
_fin.seekg(current_tag_size + current_tag_size % 2, ios::cur);
imap_size -= current_tag_size + current_tag_size % 2;
}
}
else
{
_fin.seekg(current_tag_size + current_tag_size % 2, ios::cur);
blok_size -= current_tag_size + current_tag_size % 2;
}
}
}
imap_size -= current_tag_size + current_tag_size % 2;
}
}
else
{
_fin.seekg(current_tag_size + current_tag_size % 2, ios::cur);
blok_size -= current_tag_size + current_tag_size % 2;
}
}
}
else if (current_tag_name == tag_COLR)
{
surface->color = Vec3(_read_float(), _read_float(), _read_float());
notify(DEBUG_INFO) << " color \t" << surface->color << endl;
current_tag_size -= 12;
size -= 12;
// skip ununderstooded envelope
_fin.seekg(current_tag_size + current_tag_size % 2, ios::cur);
size -= current_tag_size + current_tag_size % 2;
}
else
{
_fin.seekg(current_tag_size + current_tag_size % 2, ios::cur);
size -= current_tag_size + current_tag_size % 2;
}
{
_fin.seekg(current_tag_size + current_tag_size % 2, ios::cur);
size -= current_tag_size + current_tag_size % 2;
}
}
_surfaces[surface->name] = surface;
@@ -571,60 +613,73 @@ Lwo2::_read_surface(unsigned long size)
// Generation OSG Geode object from parsed LWO2 file
bool
Lwo2::GenerateGeode( Geode& geode )
Lwo2::GenerateGroup( Group& group )
{
if (!_successfully_read) return false;
// loading images
vector< Image* > _loaded_images;
osg::notify(DEBUG_INFO) << " images:\t" << _images.size() << endl;
IteratorString string_itr;
for (string_itr = _images.begin(); string_itr != _images.end(); string_itr++)
{
string name = *string_itr;
if (name.length() > 1)
{
notify(DEBUG_INFO) << "\tloading '" << name << "'" << endl;
Image* image = osgDB::readImageFile(name);
notify(DEBUG_INFO) << "\tresult - " << image << endl;
_loaded_images.push_back(image);
}
else
{
_loaded_images.push_back(0);
}
}
// generate StateSets for each surface
_generate_statesets_from_surfaces();
// create geometry from all layers
for (IteratorLayers itr = _layers.begin(); itr != _layers.end(); itr++)
{
osg::Geometry* geometry = new osg::Geometry();
(*itr).second->GenerateGeometry(*geometry);
osg::Geode* geode = new osg::Geode();
(*itr).second->GenerateGeode(*geode, _tags.size());
// assign StateSet for each PTAG group
for (unsigned int i = 0; i < geode->getNumDrawables(); i++)
{
geode->getDrawable(i)->setStateSet(_surfaces[_tags[i]]->state_set);
}
// simple case with one texture only
if (_tags.size() == 1)
{
Image* image = _loaded_images[_surfaces[_tags[0]]->image_index];
if (image)
{
StateSet* state_set = new osg::StateSet;
Texture* texture = new osg::Texture;
texture->setImage(image);
state_set->setTextureAttributeAndModes(0, texture, StateAttribute::ON);
geometry->setStateSet(state_set);
}
}
geode.addDrawable(geometry);
group.addChild(geode);
}
return true;
}
// generate StateSets for each surface
void
Lwo2::_generate_statesets_from_surfaces()
{
for (IteratorSurfaces itr_surf = _surfaces.begin(); itr_surf != _surfaces.end(); itr_surf++)
{
Lwo2Surface* surface = (*itr_surf).second;
StateSet* state_set = new osg::StateSet;
// check if exist texture image for this surface
if (surface->image_index >= 0)
{
notify(DEBUG_INFO) << "\tloading image '" << _images[surface->image_index] << "'" << endl;
Image* image = osgDB::readImageFile(_images[surface->image_index]);
notify(DEBUG_INFO) << "\tresult - " << image << endl;
if (image)
{
Texture* texture = new osg::Texture;
texture->setImage(image);
state_set->setTextureAttributeAndModes(0, texture, StateAttribute::ON);
}
}
// set color
Material* material = new Material();
Vec4 color(surface->color[0],
surface->color[1],
surface->color[2],
1.0f);
material->setDiffuse(Material::FRONT_AND_BACK, color);
state_set->setAttribute(material);
// setup culling
CullFace* cull = new CullFace();
cull->setMode(CullFace::BACK);
state_set->setAttribute(cull);
state_set->setMode(GL_CULL_FACE, StateAttribute::ON);
surface->state_set = state_set;
}
}
// makes 4-byte integer tag from four chars
// used in IFF standard

34
src/osgPlugins/lwo/Lwo2.h
View File

@@ -1,3 +1,28 @@
/*
* Lightwave Object version 2 loader for Open Scene Graph
* Version 2 introduced in Lightwave v6.0
*
* Copyright (C) 2002 Pavel Moloshtan <pasha@moloshtan.com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* The Open Scene Graph (OSG) is a cross platform C++/OpenGL library for
* real-time rendering of large 3D photo-realistic models.
* The OSG homepage is http://www.openscenegraph.org/
*/
#ifndef LWO2_H
#define LWO2_H 1
@@ -10,6 +35,7 @@
#include <osg/Vec2>
#include <osg/Vec3>
#include <osg/Geometry>
#include <osg/Group>
#include <osg/Notify>
using namespace osg;
@@ -32,7 +58,7 @@ class Lwo2
Lwo2();
~Lwo2();
bool ReadFile( const string& filename );
bool GenerateGeode( Geode& );
bool GenerateGroup( Group& );
private:
map< int, Lwo2Layer* > _layers;
@@ -49,6 +75,8 @@ class Lwo2
float _read_float();
string& _read_string(string&);
bool _successfully_read;
void _print_tag(unsigned int, unsigned int);
void _print_type(unsigned int);
@@ -61,6 +89,9 @@ class Lwo2
void _read_polygon_tag_mapping(unsigned long);
void _read_image_definition(unsigned long);
void _read_surface(unsigned long);
// generate StateSets for each surface
void _generate_statesets_from_surfaces();
};
// makes 4-byte integer tag from four chars
@@ -86,5 +117,6 @@ const unsigned long tag_BLOK = make_id("BLOK");
const unsigned long tag_IMAP = make_id("IMAP");
const unsigned long tag_TMAP = make_id("TMAP");
const unsigned long tag_IMAG = make_id("IMAG");
const unsigned long tag_COLR = make_id("COLR");
#endif

150
src/osgPlugins/lwo/Lwo2Layer.cpp
View File

@@ -1,3 +1,28 @@
/*
* Lightwave Object version 2 loader for Open Scene Graph
* Version 2 introduced in Lightwave v6.0
*
* Copyright (C) 2002 Pavel Moloshtan <pasha@moloshtan.com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* The Open Scene Graph (OSG) is a cross platform C++/OpenGL library for
* real-time rendering of large 3D photo-realistic models.
* The OSG homepage is http://www.openscenegraph.org/
*/
#include "Lwo2Layer.h"
Lwo2Layer::Lwo2Layer()
@@ -50,9 +75,9 @@ Lwo2Layer::notify(NotifySeverity severity)
{
osg::notify(severity) << " " << (*pol_itr)->size() << ":";
for (short_itr = (*pol_itr)->begin(); short_itr != (*pol_itr)->end(); short_itr++)
{
osg::notify(severity) << "\t" << (*short_itr);
}
{
osg::notify(severity) << "\t" << (*short_itr);
}
osg::notify(severity) << endl;
}
@@ -65,76 +90,93 @@ Lwo2Layer::notify(NotifySeverity severity)
}
void
Lwo2Layer::GenerateGeometry( Geometry& geometry )
Lwo2Layer::GenerateGeode( Geode& geode, short tags_count )
{
notify(DEBUG_INFO);
IteratorPointsList pol_itr;
Vec3Array* coords = new Vec3Array;
// create texture array
Vec2Array* texcoords = 0;
if (_points_map.size() > 0)
notify(DEBUG_INFO);
// create diffirent geomerty for each tag
for (short current_tag = 0; current_tag < tags_count; current_tag++)
{
texcoords = new Vec2Array;
}
// new geometry
ref_ptr<Geometry> geometry = osgNew Geometry;
// variables for VMAD data processing
pair<multimap< short, Lwo2PolygonMapping >::iterator,
// create coords array
ref_ptr<Vec3Array> coords = osgNew Vec3Array;
// create texture array
ref_ptr<Vec2Array> texcoords = osgNew Vec2Array;
// variables for VMAD data processing
pair<multimap< short, Lwo2PolygonMapping >::iterator,
multimap< short, Lwo2PolygonMapping >::iterator> range;
multimap< short, Lwo2PolygonMapping >::iterator itr;
multimap< short, Lwo2PolygonMapping >::iterator itr;
// all polygons
int polygon_index = 0;
for (pol_itr = _polygons.begin(); pol_itr != _polygons.end(); pol_itr++, polygon_index++)
// all polygons
int polygon_index = 0;
for (IteratorPointsList pol_itr = _polygons.begin(); pol_itr != _polygons.end(); pol_itr++, polygon_index++)
{
vector< short >::reverse_iterator short_itr;
for (short_itr = (*pol_itr)->rbegin(); short_itr != (*pol_itr)->rend(); short_itr++)
// polygons of current tag only
if (_polygons_tag[polygon_index] == current_tag)
{
// polygons coords
(*coords).push_back(_points[*short_itr]);
// all points
vector< short >::iterator short_itr;
for (short_itr = (*pol_itr)->begin(); short_itr != (*pol_itr)->end(); short_itr++)
{
// point texture coords
if (_points_map.size() > 0)
// polygons coords
(*coords).push_back(_points[*short_itr]);
// point texture coords
if (_points_map.size() > 0)
{
// VMAP data
Vec2 uv = _points_map[*short_itr];
// VMAP data
Vec2 uv = _points_map[*short_itr];
// chech if present VMAD data
if (_polygons_map.size() > 0)
// chech if present VMAD data
if (_polygons_map.size() > 0)
{
// select data for current point
range = _polygons_map.equal_range(*short_itr);
for (itr = range.first; itr != range.second; itr++)
{
// select data for current point
range = _polygons_map.equal_range(*short_itr);
for (itr = range.first; itr != range.second; itr++)
{
// found current polygon
if ((*itr).second.polygon_index == polygon_index)
{
uv = (*itr).second.uv;
}
}
// found current polygon
if ((*itr).second.polygon_index == polygon_index)
{
uv = (*itr).second.uv;
}
}
}
(*texcoords).push_back(uv);
(*texcoords).push_back(uv);
}
}
geometry.addPrimitive(new DrawArrays(Primitive::POLYGON,
(*coords).size() - (*pol_itr)->size(),
(*pol_itr)->size()));
geometry->addPrimitive(new DrawArrays(Primitive::POLYGON,
(*coords).size() - (*pol_itr)->size(),
(*pol_itr)->size()));
}
}
geometry.setVertexArray(coords);
// assign texture array
if (_points_map.size() > 0)
// add geometry if it contains any points
if (coords->size() != 0)
{
geometry.setTexCoordArray(0, texcoords);
}
geometry->setVertexArray(coords.get());
// generate normals
osgUtil::SmoothingVisitor smoother;
smoother.smooth(geometry);
// assign texture array
if ((*texcoords).size() > 0)
{
geometry->setTexCoordArray(0, texcoords.get());
}
// generate normals
osgUtil::SmoothingVisitor smoother;
smoother.smooth(*(geometry.get()));
geode.addDrawable(geometry.get());
}
}
}

35
src/osgPlugins/lwo/Lwo2Layer.h
View File

@@ -1,3 +1,28 @@
/*
* Lightwave Object version 2 loader for Open Scene Graph
* Version 2 introduced in Lightwave v6.0
*
* Copyright (C) 2002 Pavel Moloshtan <pasha@moloshtan.com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* The Open Scene Graph (OSG) is a cross platform C++/OpenGL library for
* real-time rendering of large 3D photo-realistic models.
* The OSG homepage is http://www.openscenegraph.org/
*/
#ifndef LWO2LAYER_H
#define LWO2LAYER_H 1
@@ -9,7 +34,8 @@
#include <osg/Vec2>
#include <osg/Vec3>
#include <osg/Notify>
#include <osg/Geometry>
#include <osg/Geode>
#include <osg/StateSet>
#include <osgUtil/SmoothingVisitor>
@@ -27,12 +53,13 @@ struct Lwo2Surface
{
short image_index;
string name;
Vec3 color;
StateSet* state_set;
};
struct Lwo2PolygonMapping
{
Lwo2PolygonMapping(short s,const Vec2& v2):
Lwo2PolygonMapping(short s, const Vec2& v2):
polygon_index(s),
uv(v2) {}
@@ -47,7 +74,7 @@ class Lwo2Layer
Lwo2Layer();
~Lwo2Layer();
void notify(NotifySeverity);
void GenerateGeometry( Geometry& );
void GenerateGeode( Geode&, short );
private:
short _number;

7
src/osgPlugins/lwo/ReaderWriterLWO.cpp
View File

@@ -11,7 +11,7 @@
*/
#if defined(_MSC_VER)
#pragma warning( disable : 4786 )
#pragma warning( disable : 4786 )
#endif
#include <string>
@@ -21,6 +21,7 @@
#include <osg/Node>
#include <osg/Group>
#include <osg/Geode>
#include <osg/Group>
#include <osg/Texture>
#include <osg/Geometry>
#include <osg/StateSet>
@@ -71,8 +72,8 @@ osgDB::ReaderWriter::ReadResult ReaderWriterLWO::readNode_LWO2(const std::string
std::auto_ptr<Lwo2> lwo2(new Lwo2());
lwo2->ReadFile(fileName);
osg::ref_ptr<Geode> geode = new osg::Geode();
if (lwo2->GenerateGeode(*geode)) return geode.take();
osg::ref_ptr<Group> group = new osg::Group();
if (lwo2->GenerateGroup(*group)) return group.take();
return ReadResult::FILE_NOT_HANDLED;
}

58
src/osgPlugins/osg/Texture.cpp
View File

@@ -123,7 +123,7 @@ bool Texture_readLocalData(Object& obj, Input& fr)
int x, y;
if (fr[1].getInt(x) && fr[2].getInt(y))
{
texture.setSubloadOffset(x, y);
texture.setSubloadTextureOffset(x, y);
fr += 3;
iteratorAdvanced = true;
}
@@ -133,7 +133,47 @@ bool Texture_readLocalData(Object& obj, Input& fr)
int width, height;
if (fr[1].getInt(width) && fr[2].getInt(height))
{
texture.setSubloadSize(width, height);
texture.setSubloadImageSize(width, height);
fr += 3;
iteratorAdvanced = true;
}
}
if (fr[0].matchWord("subloadTextureOffset"))
{
int x, y;
if (fr[1].getInt(x) && fr[2].getInt(y))
{
texture.setSubloadTextureOffset(x, y);
fr += 3;
iteratorAdvanced = true;
}
}
if (fr[0].matchWord("subloadTextureSize"))
{
int width, height;
if (fr[1].getInt(width) && fr[2].getInt(height))
{
texture.setSubloadTextureSize(width, height);
fr += 3;
iteratorAdvanced = true;
}
}
if (fr[0].matchWord("subloadImageOffset"))
{
int x, y;
if (fr[1].getInt(x) && fr[2].getInt(y))
{
texture.setSubloadImageOffset(x, y);
fr += 3;
iteratorAdvanced = true;
}
}
if (fr[0].matchWord("subloadImageSize"))
{
int width, height;
if (fr[1].getInt(width) && fr[2].getInt(height))
{
texture.setSubloadImageSize(width, height);
fr += 3;
iteratorAdvanced = true;
}
@@ -172,12 +212,18 @@ bool Texture_writeLocalData(const Object& obj, Output& fw)
if (texture.getSubloadMode()!=Texture::OFF)
{
int x, y;
texture.getSubloadOffset(x, y);
fw.indent() << "subloadOffset " << x << " " << y << std::endl;
texture.getSubloadTextureOffset(x, y);
fw.indent() << "subloadTextureOffset " << x << " " << y << std::endl;
int width, height;
texture.getSubloadSize(width, height);
fw.indent() << "subloadSize " << width << " " << height << std::endl;
texture.getSubloadTextureSize(width, height);
fw.indent() << "subloadTextureSize " << width << " " << height << std::endl;
texture.getSubloadImageOffset(x, y);
fw.indent() << "subloadImageOffset " << x << " " << y << std::endl;
texture.getSubloadImageSize(width, height);
fw.indent() << "subloadImageSize " << width << " " << height << std::endl;
}
return true;