added random color options, cleaned up compiler warnings, add reAverageParentColors when modifying voxel tree

ZappoMan committed 13 years ago

Commit 270f7771 parent f85abe58 files · +51 −35Browse files

Showing the changes to interface/src/VoxelSystem.cpp (1 of 8 files). Show all

Unified · Split

interface/src/VoxelSystem.cpp+2−2

@@ -74,9 +74,9 @@ void VoxelSystem::loadVoxelsFile(const char* fileName, bool wantColorRandomizer) · 73 unmodified lines
74	// mechanism to tell the system to redraw it's arrays after voxels are done	74	// mechanism to tell the system to redraw it's arrays after voxels are done
75	// being added. This is a concept mostly only understood by VoxelSystem.	75	// being added. This is a concept mostly only understood by VoxelSystem.
76	// Complaints: Brad :)	76	// Complaints: Brad :)
77	void VoxelSystem::createSphere(float r,float xc, float yc, float zc, float s, bool solid) {	77	void VoxelSystem::createSphere(float r,float xc, float yc, float zc, float s, bool solid, bool wantColorRandomizer) {
78		78
79	tree->createSphere(r,xc,yc,zc,s,solid);	79	tree->createSphere(r,xc,yc,zc,s,solid,wantColorRandomizer);
80		80
81	// reset the verticesEndPointer so we're writing to the beginning of the array	81	// reset the verticesEndPointer so we're writing to the beginning of the array
82	verticesEndPointer = verticesArray;	82	verticesEndPointer = verticesArray;