aboutsummaryrefslogtreecommitdiff
path: root/src/fb/pixfb.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/fb/pixfb.cpp')
-rw-r--r--src/fb/pixfb.cpp9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/fb/pixfb.cpp b/src/fb/pixfb.cpp
index b38ec30..c629adb 100644
--- a/src/fb/pixfb.cpp
+++ b/src/fb/pixfb.cpp
@@ -8,6 +8,7 @@
using namespace engine::fb;
using
+ engine::math::Vector2,
engine::math::Vector3,
engine::o3d::VertexData,
engine::o3d::Camera;
@@ -29,17 +30,15 @@ void PixelFrameBuffer::clear() {
extern Camera* camera;
-void PixelFrameBuffer::draw_point(int x, int y, const Vector3& loc, const VertexData& vd, const Vector3& normal) {
- (void) loc;
- (void) vd;
+void PixelFrameBuffer::draw_point(int x, int y, const Vector3& /* loc */, const Vector3& normal, const Vector2& /* uv */, const VertexData& vd) {
auto u = vd.world_loc - camera->transform.loc;
float u_len_sq = u.length_squared();
u = u.normalize();
- float attenuation = Vector3(0.f, 0.f, -1.f).rot(camera->transform.rot).dot(u);
+ float attenuation = camera->transform.rot.rot({ 0.f, 0.f, -1.f }).dot(u);
if (attenuation < .7f) attenuation = 0.f;
else if (attenuation > .8f) attenuation = 1.f;
else attenuation = (attenuation - .7f) / .1f;
- float light = -normal.dot(u) / u_len_sq;
+ float light = -normal.normalize().dot(u) / u_len_sq;
if (light < 0.f) light = 0.f;
float final_light = .003f + light * attenuation * .8f * .997f;
if (final_light > 1.f) final_light = 1.f;