s444341/Projekt_Grafika
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dodanie stacji

Browse Source
This commit is contained in:
Mikołaj Paterka 2021-02-23 17:21:30 +01:00
parent 67658b98c8
commit 13187436fa
2 changed files with 21296 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21294
models/spaceStation.obj Normal file
View File

File diff suppressed because it is too large Load Diff

4
src/orbita.cpp
View File

@ -191,7 +191,7 @@ void renderScene()
//STATION //STATION
drawObjectColor(&stationContext, glm::rotate(time / 2.0f, glm::vec3(0, 1, 0)) * glm::translate(glm::vec3(0, 0, 200)) * glm::scale(glm::vec3(5)), glm::vec3(0.5)); drawObjectColor(&stationContext, glm::rotate(time / 2.0f, glm::vec3(0, 1, 0)) * glm::translate(glm::vec3(0, 0, 200)) * glm::scale(glm::vec3(5)), glm::vec3(0.5));
//EARTH nieruchoma - ³atwiejsze dla naszej cutscenki //EARTH nieruchoma - ³atwiejsze dla naszej cutscenki
drawObjectTexture(&sphereContext, glm::scale(glm::vec3(45)), textureEarthHighres); drawObjectTexture(&sphereContext, glm::scale(glm::vec3(45)), textureEarthHighres);
@ -221,7 +221,7 @@ void init()
shipModel = obj::loadModelFromFile("models/ship_orbita.obj"); shipModel = obj::loadModelFromFile("models/ship_orbita.obj");
shipContext.initFromOBJ(shipModel); shipContext.initFromOBJ(shipModel);
stationModel = obj::loadModelFromFile("models/box.obj"); stationModel = obj::loadModelFromFile("models/spaceStation.obj");
stationContext.initFromOBJ(stationModel); stationContext.initFromOBJ(stationModel);
sphereModel = obj::loadModelFromFile("models/sphere.obj"); sphereModel = obj::loadModelFromFile("models/sphere.obj");