Showing the changes to interface/src/main.cpp (1 of 17 files). Show all
Unified · Split
| @@ -50,6 +50,7 @@ · 49 unmodified lines | ||
| 50 | 50 | #include "Log.h" |
| 51 | 51 | #include "shared_Log.h" |
| 52 | 52 | #include "voxels_Log.h" |
| 53 | +#include "avatars_Log.h" | |
| 53 | 54 | |
| 54 | 55 | #include "Field.h" |
| 55 | 56 | #include "world.h" |
| @@ -136,7 +137,7 @@ Cloud cloud(0, // Particles · 80 unmodified lines | ||
| 136 | 137 | false // Wrap |
| 137 | 138 | ); |
| 138 | 139 | |
| 139 | −VoxelSystem voxSys; | |
| 140 | +VoxelSystem voxels; | |
| 140 | 141 | Field field; |
| 141 | 142 | |
| 142 | 143 | #ifndef _WIN32 |
| @@ -245,28 +246,28 @@ void displayStats(void) · 102 unmodified lines | ||
| 245 | 246 | } |
| 246 | 247 | |
| 247 | 248 | std::stringstream voxelStats; |
| 248 | − voxelStats << "Voxels Rendered: " << voxSys.getVoxelsRendered(); | |
| 249 | + voxelStats << "Voxels Rendered: " << voxels.getVoxelsRendered(); | |
| 249 | 250 | drawtext(10, statsVerticalOffset + 70, 0.10f, 0, 1.0, 0, (char *)voxelStats.str().c_str()); |
| 250 | 251 | |
| 251 | 252 | voxelStats.str(""); |
| 252 | − voxelStats << "Voxels Created: " << voxSys.getVoxelsCreated() << " (" << voxSys.getVoxelsCreatedRunningAverage() | |
| 253 | + voxelStats << "Voxels Created: " << voxels.getVoxelsCreated() << " (" << voxels.getVoxelsCreatedRunningAverage() | |
| 253 | 254 | << "/sec in last "<< COUNTETSTATS_TIME_FRAME << " seconds) "; |
| 254 | 255 | drawtext(10, statsVerticalOffset + 250, 0.10f, 0, 1.0, 0, (char *)voxelStats.str().c_str()); |
| 255 | 256 | |
| 256 | 257 | voxelStats.str(""); |
| 257 | − voxelStats << "Voxels Colored: " << voxSys.getVoxelsColored() << " (" << voxSys.getVoxelsColoredRunningAverage() | |
| 258 | + voxelStats << "Voxels Colored: " << voxels.getVoxelsColored() << " (" << voxels.getVoxelsColoredRunningAverage() | |
| 258 | 259 | << "/sec in last "<< COUNTETSTATS_TIME_FRAME << " seconds) "; |
| 259 | 260 | drawtext(10, statsVerticalOffset + 270, 0.10f, 0, 1.0, 0, (char *)voxelStats.str().c_str()); |
| 260 | 261 | |
| 261 | 262 | voxelStats.str(""); |
| 262 | − voxelStats << "Voxels Bytes Read: " << voxSys.getVoxelsBytesRead() | |
| 263 | − << " (" << voxSys.getVoxelsBytesReadRunningAverage() << "/sec in last "<< COUNTETSTATS_TIME_FRAME << " seconds) "; | |
| 263 | + voxelStats << "Voxels Bytes Read: " << voxels.getVoxelsBytesRead() | |
| 264 | + << " (" << voxels.getVoxelsBytesReadRunningAverage() << "/sec in last "<< COUNTETSTATS_TIME_FRAME << " seconds) "; | |
| 264 | 265 | drawtext(10, statsVerticalOffset + 290,0.10f, 0, 1.0, 0, (char *)voxelStats.str().c_str()); |
| 265 | 266 | |
| 266 | 267 | voxelStats.str(""); |
| 267 | − long int voxelsBytesPerColored = voxSys.getVoxelsColored() ? voxSys.getVoxelsBytesRead()/voxSys.getVoxelsColored() : 0; | |
| 268 | − long int voxelsBytesPerColoredAvg = voxSys.getVoxelsColoredRunningAverage() ? | |
| 269 | − voxSys.getVoxelsBytesReadRunningAverage()/voxSys.getVoxelsColoredRunningAverage() : 0; | |
| 268 | + long int voxelsBytesPerColored = voxels.getVoxelsColored() ? voxels.getVoxelsBytesRead()/voxels.getVoxelsColored() : 0; | |
| 269 | + long int voxelsBytesPerColoredAvg = voxels.getVoxelsColoredRunningAverage() ? | |
| 270 | + voxels.getVoxelsBytesReadRunningAverage()/voxels.getVoxelsColoredRunningAverage() : 0; | |
| 270 | 271 | |
| 271 | 272 | voxelStats << "Voxels Bytes per Colored: " << voxelsBytesPerColored |
| 272 | 273 | << " (" << voxelsBytesPerColoredAvg << "/sec in last "<< COUNTETSTATS_TIME_FRAME << " seconds) "; |
| @@ -303,8 +304,8 @@ void initDisplay(void) · 30 unmodified lines | ||
| 303 | 304 | |
| 304 | 305 | void init(void) |
| 305 | 306 | { |
| 306 | − voxSys.init(); | |
| 307 | − voxSys.setViewerHead(&myAvatar); | |
| 307 | + voxels.init(); | |
| 308 | + voxels.setViewerHead(&myAvatar); | |
| 308 | 309 | myAvatar.setRenderYaw(startYaw); |
| 309 | 310 | |
| 310 | 311 | headMouseX = WIDTH/2; |
| @@ -819,7 +820,7 @@ void display(void) · 508 unmodified lines | ||
| 819 | 820 | // Draw voxels |
| 820 | 821 | if ( showingVoxels ) |
| 821 | 822 | { |
| 822 | − voxSys.render(); | |
| 823 | + voxels.render(); | |
| 823 | 824 | } |
| 824 | 825 | |
| 825 | 826 | // Draw field vectors |
| @@ -1153,7 +1154,7 @@ void addRandomSphere(bool wantColorRandomizer) · 327 unmodified lines | ||
| 1153 | 1154 | printLog("yc=%f\n",yc); |
| 1154 | 1155 | printLog("zc=%f\n",zc); |
| 1155 | 1156 | |
| 1156 | − voxSys.createSphere(r,xc,yc,zc,s,solid,wantColorRandomizer); | |
| 1157 | + voxels.createSphere(r,xc,yc,zc,s,solid,wantColorRandomizer); | |
| 1157 | 1158 | } |
| 1158 | 1159 | |
| 1159 | 1160 | |
| @@ -1315,7 +1316,7 @@ void *networkReceive(void *args) · 155 unmodified lines | ||
| 1315 | 1316 | case PACKET_HEADER_VOXEL_DATA: |
| 1316 | 1317 | case PACKET_HEADER_Z_COMMAND: |
| 1317 | 1318 | case PACKET_HEADER_ERASE_VOXEL: |
| 1318 | − voxSys.parseData(incomingPacket, bytesReceived); | |
| 1319 | + voxels.parseData(incomingPacket, bytesReceived); | |
| 1319 | 1320 | break; |
| 1320 | 1321 | case PACKET_HEADER_BULK_AVATAR_DATA: |
| 1321 | 1322 | AgentList::getInstance()->processBulkAgentData(&senderAddress, |
| @@ -1516,8 +1517,9 @@ void audioMixerUpdate(in_addr_t newMixerAddress, in_port_t newMixerPort) { · 194 unmodified lines | ||
| 1516 | 1517 | |
| 1517 | 1518 | int main(int argc, const char * argv[]) |
| 1518 | 1519 | { |
| 1519 | − shared::printLog = ::printLog; | |
| 1520 | − voxels::printLog = ::printLog; | |
| 1520 | + shared_lib::printLog = & ::printLog; | |
| 1521 | + voxels_lib::printLog = & ::printLog; | |
| 1522 | + avatars_lib::printLog = & ::printLog; | |
| 1521 | 1523 | |
| 1522 | 1524 | // Quick test of the Orientation class on startup! |
| 1523 | 1525 | testOrientationClass(); |
| @@ -1601,7 +1603,7 @@ int main(int argc, const char * argv[]) · 77 unmodified lines | ||
| 1601 | 1603 | // Voxel File. If so, load it now. |
| 1602 | 1604 | const char* voxelsFilename = getCmdOption(argc, argv, "-i"); |
| 1603 | 1605 | if (voxelsFilename) { |
| 1604 | − voxSys.loadVoxelsFile(voxelsFilename,wantColorRandomizer); | |
| 1606 | + voxels.loadVoxelsFile(voxelsFilename,wantColorRandomizer); | |
| 1605 | 1607 | printLog("Local Voxel File loaded.\n"); |
| 1606 | 1608 | } |
| 1607 | 1609 | |