mirror of
https://github.com/TheRedShip/RT_GPU.git
synced 2025-09-27 18:48:36 +02:00
* | Cleaning
This commit is contained in:
@ -4,7 +4,7 @@ MAT 255 255 255 5.0 0.0 0.0 //white light
|
|||||||
|
|
||||||
MAT 040 150 080 0.0 0.0 0.0 //green
|
MAT 040 150 080 0.0 0.0 0.0 //green
|
||||||
MAT 040 080 150 0.0 0.0 0.0 //blue
|
MAT 040 080 150 0.0 0.0 0.0 //blue
|
||||||
MAT 255 255 255 0.0 1.0 0.15 //white
|
MAT 255 255 255 0.0 0.0 0 //white
|
||||||
|
|
||||||
|
|
||||||
sp 40 100 100 50 0
|
sp 40 100 100 50 0
|
||||||
|
@ -39,7 +39,10 @@ int main(int argc, char **argv)
|
|||||||
|
|
||||||
const std::vector<GPUObject> &object_data = scene.getObjectData();
|
const std::vector<GPUObject> &object_data = scene.getObjectData();
|
||||||
const std::vector<GPUMaterial> &material_data = scene.getMaterialData();
|
const std::vector<GPUMaterial> &material_data = scene.getMaterialData();
|
||||||
std::cout << "Sending " << object_data.size() << " objects for "<< object_data.size() * sizeof(GPUObject) << " / " << max_gpu_size << " bytes" << std::endl;
|
std::cout << "Sending " << object_data.size() << " objects for " << \
|
||||||
|
object_data.size() * sizeof(GPUObject) + material_data.size() * sizeof(GPUMaterial) \
|
||||||
|
<< " / " << max_gpu_size << " bytes" << std::endl;
|
||||||
|
|
||||||
|
|
||||||
while (!window.shouldClose())
|
while (!window.shouldClose())
|
||||||
{
|
{
|
||||||
|
@ -59,6 +59,7 @@ void Scene::addObject(Object *object)
|
|||||||
void Scene::addMaterial(Material *material)
|
void Scene::addMaterial(Material *material)
|
||||||
{
|
{
|
||||||
_materials.push_back(material);
|
_materials.push_back(material);
|
||||||
|
this->updateGPUData();
|
||||||
}
|
}
|
||||||
|
|
||||||
void Scene::updateGPUData()
|
void Scene::updateGPUData()
|
||||||
|
Reference in New Issue
Block a user