CSPublic/Blocks3D
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into MusicalProgrammer

Browse Source
This commit is contained in:
MusicalProgrammer
2018-06-02 15:08:49 -04:00
parent da9d64c56f 8f72e8e666
commit f934a3fa38
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
PhysicalInstance.cpp
View File

@@ -117,7 +117,7 @@ Box PhysicalInstance::getBox()
void PhysicalInstance::render(RenderDevice* rd) void PhysicalInstance::render(RenderDevice* rd)
{ {
if(changed) if(changed)
Box box = getBox(); Box box = getBox();
glColor(color); glColor(color);
glBegin(GL_QUADS); glBegin(GL_QUADS);
for(int i = 0; i < 96; i+=16) for(int i = 0; i < 96; i+=16)

9
main.cpp
View File

@@ -705,7 +705,7 @@ void Demo::onInit() {
//setDesiredFrameRate(FPSVal[index]); //setDesiredFrameRate(60);
@@ -1051,7 +1051,10 @@ void Demo::onGraphics(RenderDevice* rd) {
renderDevice->setLight(0, GLight::directional(lighting.lightDirection, lighting.lightColor)); renderDevice->setLight(0, GLight::directional(lighting.lightDirection, lighting.lightColor));
renderDevice->setAmbientLightColor(lighting.ambient); renderDevice->setAmbientLightColor(lighting.ambient);
rd->beforePrimitive();
dataModel->getWorkspace()->render(rd); dataModel->getWorkspace()->render(rd);
rd->afterPrimitive();
if(selectedInstance != NULL) if(selectedInstance != NULL)
{ {
PhysicalInstance* part = (PhysicalInstance*)selectedInstance; PhysicalInstance* part = (PhysicalInstance*)selectedInstance;
@@ -1402,7 +1405,7 @@ void Demo::main() {
RealTime now=0, lastTime=0; RealTime now=0, lastTime=0;
double simTimeRate = 1.0f; double simTimeRate = 1.0f;
float fps=30.f; float fps=30.0f;
RealTime desiredFrameDuration=1.0/fps; RealTime desiredFrameDuration=1.0/fps;
onInit(); onInit();
@@ -1502,7 +1505,7 @@ int main(int argc, char** argv) {
HWND hwndMain = CreateWindowEx( HWND hwndMain = CreateWindowEx(
WS_EX_ACCEPTFILES | WS_EX_CLIENTEDGE, WS_EX_ACCEPTFILES,
"mainHWND", "mainHWND",
"Main test", "Main test",
WS_OVERLAPPEDWINDOW, WS_OVERLAPPEDWINDOW,