comparison Vis.cpp @ 64:f6e7d7110512

Слияние
author Ritor1
date Wed, 23 Jan 2013 13:14:41 +0600
parents a96ebf3123d2 80484cf3a683
children 31feb3432bbd
comparison
equal deleted inserted replaced
63:a96ebf3123d2 64:f6e7d7110512
1603 { 1603 {
1604 RenderVertexSoft pMouseRay[2]; // [sp+1Ch] [bp-60h]@1 1604 RenderVertexSoft pMouseRay[2]; // [sp+1Ch] [bp-60h]@1
1605 1605
1606 stru1.uNumPointers = 0; 1606 stru1.uNumPointers = 0;
1607 CastPickRay(pMouseRay, fMouseX, fMouseY, fDepth); 1607 CastPickRay(pMouseRay, fMouseX, fMouseY, fDepth);
1608 //PickBillboards(fDepth, fMouseX, fMouseY, &stru1, a5); 1608 PickBillboards(fDepth, fMouseX, fMouseY, &stru1, a5);//Ritor1: do comment to test
1609 if (uCurrentlyLoadedLevelType == LEVEL_Indoor) 1609 if (uCurrentlyLoadedLevelType == LEVEL_Indoor)
1610 PickIndoor(fDepth, pMouseRay, &stru1, a6); 1610 PickIndoor(fDepth, pMouseRay, &stru1, a6);
1611 else 1611 else
1612 PickOutdoor(fDepth, pMouseRay, &stru1, a6, 0); 1612 PickOutdoor(fDepth, pMouseRay, &stru1, a6, 0);
1613 stru1.create_object_pointers(0); 1613 stru1.create_object_pointers(0);