remove "default" shader

Author: fogleman

examples/bowser.go

@@ -38,18 +38,20 @@ func main() {
 
 	// create a rendering context
 	context := NewContext(width*scale, height*scale)
+	context.ClearColorBufferWith(Black)
 
 	// create transformation matrix and light direction
 	aspect := float64(width) / float64(height)
 	matrix := LookAt(eye, center, up).Perspective(fovy, aspect, near, far)
 	light := V(0.75, 0.25, 1).Normalize()
-	color := White
 
 	// render
-	context.ClearColor = Black
-	context.Shader = NewDefaultShader(matrix, light, eye, color)
-	context.ClearColorBuffer()
-	context.ClearDepthBuffer()
+	shader := NewPhongShader(matrix, light, eye)
+	shader.ObjectColor = HexColor("FFD34E")
+	shader.DiffuseColor = Gray(0.9)
+	shader.SpecularColor = Gray(0.25)
+	shader.SpecularPower = 100
+	context.Shader = shader
 	start := time.Now()
 	context.DrawMesh(mesh)
 	fmt.Println(time.Since(start))

examples/capsule.go

@@ -48,11 +48,9 @@ func main() {
 	matrix := LookAt(eye, center, up).Perspective(fovy, aspect, near, far)
 
 	// render
-	context.ClearColor = White
-	shader := NewDefaultShader(matrix, light, eye, Black)
+	shader := NewPhongShader(matrix, light, eye)
 	shader.Texture = texture
 	context.Shader = shader
-	context.ClearColorBuffer()
 	start := time.Now()
 	context.DrawMesh(mesh)
 	fmt.Println(time.Since(start))

examples/dragon.go

@@ -62,15 +62,16 @@ func main() {
 
 	// create a rendering context
 	context := NewContext(width*scale, height*scale)
-	context.ClearColor = background
+	context.ClearColorBufferWith(background)
 
 	// create transformation matrix and light direction
 	aspect := float64(width) / float64(height)
 	matrix := LookAt(eye, center, up).Perspective(fovy, aspect, near, far)
 
 	// render
-	context.ClearColorBuffer()
-	context.Shader = NewDefaultShader(matrix, light, eye, color)
+	shader := NewPhongShader(matrix, light, eye)
+	shader.ObjectColor = color
+	context.Shader = shader
 	done = timed("rendering mesh")
 	context.DrawMesh(mesh)
 	done()

examples/hello.go

@@ -33,7 +33,9 @@ func main() {
 	light := V(-2, 0, 1).Normalize()
 	color := Color{0.5, 1, 0.65, 1}
 
-	context.Shader = NewDefaultShader(matrix, light, eye, color)
+	shader := NewPhongShader(matrix, light, eye)
+	shader.ObjectColor = color
+	context.Shader = shader
 	context.DrawMesh(mesh)
 
 	SavePNG("out.png", context.Image())

examples/magica.go

@@ -71,7 +71,7 @@ func main() {
 	shader := NewPhongShader(matrix, light, eye)
 	shader.AmbientColor = Gray(0.4)
 	shader.DiffuseColor = Gray(0.9)
-	shader.SpecularColor = Gray(0)
+	shader.SpecularPower = 0
 	context.Shader = shader
 	done = timed("rendering triangles")
 	context.DrawTriangles(mesh.Triangles)

examples/shapes.go

@@ -51,22 +51,27 @@ func main() {
 
 	// create a rendering context
 	context := NewContext(width*scale, height*scale)
+	context.ClearColorBufferWith(Black)
 
 	// create transformation matrix and light direction
 	aspect := float64(width) / float64(height)
 	matrix := LookAt(eye, center, up).Perspective(fovy, aspect, near, far)
 
 	// render
-	context.ClearColorBufferWith(Black)
-	context.Shader = NewDefaultShader(matrix, light, eye, color)
+	shader := NewPhongShader(matrix, light, eye)
+	shader.ObjectColor = color
+	context.Shader = shader
 	start := time.Now()
 	context.DrawMesh(mesh)
 	fmt.Println(time.Since(start))
 
 	mesh, _ = LoadSTL("examples/sphere.stl")
 	mesh.SmoothNormals()
 	mesh.Transform(Scale(V(2.5, 2.5, 2.5)))
-	context.Shader = NewDefaultShader(matrix, light, eye, HexColor("FFFF9D").Alpha(0.65))
+	shader = NewPhongShader(matrix, light, eye)
+	shader.ObjectColor = HexColor("FFFF9D").Alpha(0.65)
+	shader.SpecularPower = 0
+	context.Shader = shader
 	context.DrawMesh(mesh)
 	context.Wireframe = true
 	context.DepthBias = -0.00001

examples/square.go

@@ -51,7 +51,7 @@ func main() {
 	matrix := LookAt(eye, center, up).Perspective(fovy, aspect, near, far)
 
 	// render
-	shader := NewDefaultShader(matrix, light, eye, color)
+	shader := NewTextureShader(matrix, texture)
 	shader.Texture = texture
 	start := time.Now()
 	context.Shader = shader

examples/teapot.go

@@ -43,15 +43,15 @@ func main() {
 	// create transformation matrix and light direction
 	aspect := float64(width) / float64(height)
 	matrix := LookAt(eye, center, up).Perspective(fovy, aspect, near, far)
-	// h := 0.6
-	// w := h * float64(width) / float64(height)
-	// matrix := LookAt(eye, center, up).Orthographic(-w, w, -h, h, -10, 10)
 	light := V(0, 1, 1).Normalize()
-	color := HexColor("#B9121B")
 
 	// render
 	start := time.Now()
-	context.Shader = NewDefaultShader(matrix, light, eye, color)
+	shader := NewPhongShader(matrix, light, eye)
+	shader.ObjectColor = HexColor("#B9121B")
+	shader.SpecularColor = Gray(0.25)
+	shader.SpecularPower = 64
+	context.Shader = shader
 	context.DrawMesh(mesh)
 	fmt.Println(time.Since(start))
 

examples/test1.go

@@ -7,42 +7,6 @@ type Shader interface {
 	Fragment(Vertex) Color
 }
 
-type DefaultShader struct {
-	Matrix  Matrix
-	Light   Vector
-	Camera  Vector
-	Color   Color
-	Texture Texture
-}
-
-func NewDefaultShader(matrix Matrix, light, camera Vector, color Color) *DefaultShader {
-	return &DefaultShader{matrix, light, camera, color, nil}
-}
-
-func (shader *DefaultShader) Vertex(v Vertex) Vertex {
-	v.Output = shader.Matrix.MulPositionW(v.Position)
-	return v
-}
-
-func (shader *DefaultShader) Fragment(v Vertex) Color {
-	color := shader.Color
-	if color == Discard {
-		color = v.Color
-	}
-	if shader.Texture != nil {
-		color = shader.Texture.BilinearSample(v.Texture.X, v.Texture.Y)
-	}
-	diffuse := math.Max(v.Normal.Dot(shader.Light), 0)
-	specular := 0.0
-	if diffuse > 0 {
-		camera := shader.Camera.Sub(v.Position).Normalize()
-		specular = math.Max(camera.Dot(shader.Light.Negate().Reflect(v.Normal)), 0)
-		specular = math.Pow(specular, 50)
-	}
-	light := Clamp(diffuse+specular, 0.1, 1)
-	return color.MulScalar(light).Alpha(color.A)
-}
-
 // SolidColorShader renders with a single, solid color.
 type SolidColorShader struct {
 	Matrix Matrix
@@ -119,7 +83,7 @@ func (shader *PhongShader) Fragment(v Vertex) Color {
 	}
 	diffuse := math.Max(v.Normal.Dot(shader.LightDirection), 0)
 	light = light.Add(shader.DiffuseColor.MulScalar(diffuse))
-	if diffuse > 0 {
+	if diffuse > 0 && shader.SpecularPower > 0 {
 		camera := shader.CameraPosition.Sub(v.Position).Normalize()
 		reflected := shader.LightDirection.Negate().Reflect(v.Normal)
 		specular := math.Max(camera.Dot(reflected), 0)