From: Mike G. <xo...@gm...> - 2007-12-18 06:12:42
|
For now I agree. I changed it back to make testing a little easier. I'm changing how this works a little bit so that how it works now (exactly) will be the default and then you have to specify to use proxy textures. Maybe we can change this some time in the future, but it will break backwards compatibility whatever way we choose to do it then, so it'd have to be for an X.0 release I imagine. On 17/12/2007, Jorrit Tyberghein <jor...@gm...> wrote: > > This is still not a good default. I have at least two external > applications that break with > this: > - Blocks3D: uses LoadMapFile() with textures that are not used in > the wold file. > It has to be a world file since that file also contains sectors. > The materials are > not used in that world file but they are used in the program. > Setting this default > so that textures are not loaded when they are not used will break > Blocks3D. > - CEL: CEL uses the textures in XML scripts even before LoadMapFile() > has > finished. > > So I really think the default should be to have this feature disabled. > It is the only > compatible way. > > Greetings, > > On Dec 18, 2007 1:27 AM, <mg...@us...> wrote: > > Revision: 28330 > > http://crystal.svn.sourceforge.net/crystal/?rev=28330&view=rev > > Author: mgist > > Date: 2007-12-17 16:27:30 -0800 (Mon, 17 Dec 2007) > > > > Log Message: > > ----------- > > - Default to use proxy textures again. > > > > Modified Paths: > > -------------- > > CS/branches/feature/proxytexture/include/imap/loader.h > > CS/branches/feature/proxytexture/plugins/csparser/loadtex.cpp > > > > Modified: CS/branches/feature/proxytexture/include/imap/loader.h > > =================================================================== > > --- > CS/branches/feature/proxytexture/include/imap/loader.h 2007-12-17 > 23:54:50 UTC (rev 28329) > > +++ > CS/branches/feature/proxytexture/include/imap/loader.h 2007-12-18 > 00:27:30 UTC (rev 28330) > > @@ -319,7 +319,7 @@ > > virtual bool LoadMapFile (const char* filename, bool clearEngine = > true, > > iRegion* region = 0, bool curRegOnly = true, > > bool checkDupes = false, iStreamSource* ssource = 0, > > - iMissingLoaderData* missingdata = 0, bool forceLoadTextures = > true) = 0; > > + iMissingLoaderData* missingdata = 0, bool forceLoadTextures = > false) = 0; > > > > /** > > * Load a map from the given 'world' node. If 'clearEngine' is true > then > > @@ -352,7 +352,7 @@ > > virtual bool LoadMap (iDocumentNode* world_node, bool clearEngine = > true, > > iRegion* region = 0, bool curRegOnly = true, > > bool checkDupes = false, iStreamSource* ssource = 0, > > - iMissingLoaderData* missingdata = 0, bool forceLoadTextures = > true) = 0; > > + iMissingLoaderData* missingdata = 0, bool forceLoadTextures = > false) = 0; > > > > /** > > * Load library from a VFS file > > > > Modified: CS/branches/feature/proxytexture/plugins/csparser/loadtex.cpp > > =================================================================== > > --- CS/branches/feature/proxytexture/plugins/csparser/loadtex.cpp > 2007-12-17 23:54:50 UTC (rev 28329) > > +++ CS/branches/feature/proxytexture/plugins/csparser/loadtex.cpp > 2007-12-18 00:27:30 UTC (rev 28330) > > @@ -341,7 +341,6 @@ > > // @@@ Note from Jorrit: the code below is too late for loading the > > // textures since xml in the map itself sometimes also needs the > > // textures already (i.e. CEL XML scripts using billboards). > > -#if 0 > > iTextureManager *tm = G3D->GetTextureManager(); > > size_t i = proxyTextures.GetSize(); > > while (i-- > 0) > > @@ -358,7 +357,6 @@ > > proxTex.textureWrapper->SetImageFile (img); > > proxTex.textureWrapper->Register (tm); > > } > > -#endif > > proxyTextures.Empty (); > > > > return true; > > > > > > This was sent by the SourceForge.net collaborative development platform, > the world's largest Open Source development site. > > > > > ------------------------------------------------------------------------- > > SF.Net email is sponsored by: > > Check out the new SourceForge.net Marketplace. > > It's the best place to buy or sell services > > for just about anything Open Source. > > > http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace > > _______________________________________________ > > Crystal-cvs mailing list > > Cry...@li... > > https://lists.sourceforge.net/lists/listinfo/crystal-cvs > > > > > > -- > Project Manager of Crystal Space (http://www.crystalspace3d.org) > and CEL (http://cel.crystalspace3d.org) > Support Crystal Space. Donate at > https://sourceforge.net/donate/index.php?group_id=649 > -- -Mike |