X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FObjects%2FObjects.cpp;h=3877b9e8e6c29be90ce6d5c668d8902200254ed1;hb=1f7114ce6178de7231a890c31535acbbc34b3c6b;hp=9064ff8adb263c662613c30cd1970c96123d56a9;hpb=ed3662c0852c4312a612b4fc35bd03aba8d13db7;p=lugaru.git diff --git a/Source/Objects/Objects.cpp b/Source/Objects/Objects.cpp index 9064ff8..3877b9e 100644 --- a/Source/Objects/Objects.cpp +++ b/Source/Objects/Objects.cpp @@ -595,14 +595,14 @@ void Objects::MakeObject(int atype, XYZ where, float ayaw, float ascale) model[numobjects].CalculateNormals(1); model[numobjects].ScaleNormals(-1, -1, -1); - if (atype == treetrunktype && position[numobjects].y < terrain.getHeight(position[numobjects].x, position[numobjects].z) + 1) { - if (detail == 2) + if (detail == 2) { + if (atype == treetrunktype && position[numobjects].y < terrain.getHeight(position[numobjects].x, position[numobjects].z) + 1) { terrain.MakeDecal(shadowdecalpermanent, position[numobjects], 2, .4, 0); - } + } - if (atype == bushtype && position[numobjects].y < terrain.getHeight(position[numobjects].x, position[numobjects].z) + 1) { - if (detail == 2) + if (atype == bushtype && position[numobjects].y < terrain.getHeight(position[numobjects].x, position[numobjects].z) + 1) { terrain.MakeDecal(shadowdecalpermanent, position[numobjects], 1, .4, 0); + } } if (atype != treeleavestype && atype != bushtype && atype != firetype) @@ -689,18 +689,19 @@ void Objects::MakeObject(int atype, XYZ where, float ayaw, float apitch, float a model[numobjects].CalculateNormals(1); model[numobjects].ScaleNormals(-1, -1, -1); - if (atype == treetrunktype && position[numobjects].y < terrain.getHeight(position[numobjects].x, position[numobjects].z) + 1) { - if (detail == 2) + if (detail == 2) { + if (atype == treetrunktype && position[numobjects].y < terrain.getHeight(position[numobjects].x, position[numobjects].z) + 1) { terrain.MakeDecal(shadowdecalpermanent, position[numobjects], 2, .4, 0); - } + } - if (atype == bushtype && position[numobjects].y < terrain.getHeight(position[numobjects].x, position[numobjects].z) + 1) { - if (detail == 2) + if (atype == bushtype && position[numobjects].y < terrain.getHeight(position[numobjects].x, position[numobjects].z) + 1) { terrain.MakeDecal(shadowdecalpermanent, position[numobjects], 1, .4, 0); + } } - if (atype != treeleavestype && atype != bushtype && atype != firetype) + if (atype != treeleavestype && atype != bushtype && atype != firetype) { terrain.AddObject(where + DoRotation(model[numobjects].boundingspherecenter, 0, ayaw, 0), model[numobjects].boundingsphereradius, numobjects); + } numobjects++; } @@ -838,5 +839,4 @@ Objects::~Objects() treetextureptr.destroy(); bushtextureptr.destroy(); rocktextureptr.destroy(); -}; - +}