Bulk of mesh. Excluded via #if MESH_ENABLED. LLModel still needs updated for strided vbos, Collada SDK needs to be wrangled, and misc pieces need to be found and brought over. Skipping inventory stuff until meshes are at least displayable.

This commit is contained in:
Shyotl
2011-07-23 03:26:30 -05:00
parent 179193d173
commit 1e92e734d8
29 changed files with 10133 additions and 92 deletions

View File

@@ -52,6 +52,9 @@
#include "llwindow.h"
#include "llviewerstats.h"
#include "llmd5.h"
#if MESH_ENABLED
#include "llmeshrepository.h"
#endif //MESH_ENABLED
#include "llpumpio.h"
#include "llimpanel.h"
#include "llmimetypes.h"
@@ -1110,6 +1113,9 @@ bool LLAppViewer::mainLoop()
break;
}
}
#if MESH_ENABLED
gMeshRepo.update() ;
#endif //MESH_ENABLED
if ((LLStartUp::getStartupState() >= STATE_CLEANUP) &&
(frameTimer.getElapsedTimeF64() > FRAME_STALL_THRESHOLD))
{
@@ -1233,6 +1239,11 @@ bool LLAppViewer::cleanup()
llinfos << "Cleaning Up" << llendflush;
#if MESH_ENABLED
// shut down mesh streamer
gMeshRepo.shutdown();
#endif //MESH_ENABLED
// Must clean up texture references before viewer window is destroyed.
if(LLHUDManager::instanceExists())
{
@@ -1655,6 +1666,11 @@ bool LLAppViewer::initThreads()
LLAppViewer::sTextureFetch = new LLTextureFetch(LLAppViewer::getTextureCache(), sImageDecodeThread, enable_threads && true);
LLImage::initClass();
#if MESH_ENABLED
// Mesh streaming and caching
gMeshRepo.init();
#endif //MESH_ENABLED
// *FIX: no error handling here!
return true;
}