Week9 [23/11] - [29/11]
Added Lighting Changes for Vertex Normal Calculation Added Method to Get a Polygons Vertices as a Vector array Added Methods to Add the Color to a Polygon and Vertex Object Added Normalization to the Polygon normal vector Added Vector Normal Calculation to the Model Class Added Light Calculation method to the Rasterizer Class Added Flag to Rasterizer to stop processing when the screen is minimised Added Flat and Gouraud Drawing Methods to the Resterizer Added Standard and INT triangle drawing Methods Added Function to mimic sgn function from Java Added Length to Vector3D class Added / operator to Vector3D class Added Get(x,y,z,w)Int methods to Vertex class Changed Color Variables on the Vertex/Polygon classes to use r, g and b values rather than COLORREF Changed Camera translation functions to use normal Translation Functions Cleaned up Code Removed Unused code from the Camera Class
This commit is contained in:
@ -34,17 +34,17 @@ Vector3D DirectionalLight::GetLightDirection() const
|
||||
return _lightDirection;
|
||||
}
|
||||
|
||||
COLORREF DirectionalLight::CalculateLight(const Model& currentModel, const Polygon3D& currentPolygon, COLORREF colorIn)
|
||||
COLORREF DirectionalLight::CalculateLightShared(const Model& currentModel, const Vector3D& currentNormal, COLORREF colorIn)
|
||||
{
|
||||
float workingRed = (float) GetRedLightIntensity();
|
||||
float workingGreen = (float) GetGreenLightIntensity();
|
||||
float workingBlue = (float) GetBlueLightIntensity();
|
||||
float workingRed = (float)GetRedLightIntensity();
|
||||
float workingGreen = (float)GetGreenLightIntensity();
|
||||
float workingBlue = (float)GetBlueLightIntensity();
|
||||
|
||||
workingRed *= currentModel.GetRedReflectionCoefficient();
|
||||
workingGreen *= currentModel.GetGreenReflectionCoefficient();
|
||||
workingBlue *= currentModel.GetBlueReflectionCoefficient();
|
||||
|
||||
float lightDotProd = Vector3D::DotProduct(_normalizedLightDirection, currentPolygon.GetNormal());
|
||||
|
||||
float lightDotProd = Vector3D::DotProduct(_normalizedLightDirection, currentNormal);
|
||||
|
||||
workingRed *= lightDotProd;
|
||||
workingGreen *= lightDotProd;
|
||||
@ -62,6 +62,16 @@ COLORREF DirectionalLight::CalculateLight(const Model& currentModel, const Polyg
|
||||
return outputColor;
|
||||
}
|
||||
|
||||
COLORREF DirectionalLight::CalculateLight(const Model& currentModel, const Polygon3D& currentPolygon, COLORREF colorIn)
|
||||
{
|
||||
return CalculateLightShared(currentModel, currentPolygon.GetNormal(), colorIn);
|
||||
}
|
||||
|
||||
COLORREF DirectionalLight::CalculateLight(const Model& currentModel, const Vertex& currentVertex, COLORREF colorIn)
|
||||
{
|
||||
return CalculateLightShared(currentModel, currentVertex.GetNormal(), colorIn);
|
||||
}
|
||||
|
||||
DirectionalLight& DirectionalLight::operator= (const DirectionalLight& rhs)
|
||||
{
|
||||
if (this != &rhs)
|
||||
|
Reference in New Issue
Block a user