Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion index.html
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
<span id="fps"></span><span> fps</span>
</div>
</div>
<script src="vendor/gpu.min.js"></script>
<script src="//cdn.rawgit.com/gpujs/gpu.js/develop/bin/gpu.min.js"></script>
<script src="raytracer.js"></script>
</body>
</html>
10 changes: 5 additions & 5 deletions raytracer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -96,17 +96,17 @@ let constants = {
THINGSCOUNT: things.length,
}

let opt = (mode: Mode) => {
let opt = () => {
return {
constants: constants,
debug: true,
dimensions: [width, height],
output: [width, height],
graphical: true,
mode: stringOfMode (mode),
safeTextureReadHack: false,
}
}

let cpu = new GPU ({ mode: 'cpu' })
let gpu = new GPU ()
/*----------------------------------------------------------------
* Helper functions for use within the kernel.
Expand Down Expand Up @@ -231,7 +231,7 @@ let kernelFunctions = [
kernelFunctions.forEach(f => gpu.addFunction(f))

let createKernel = (mode) => {
let kernel = gpu.createKernel (
let kernel = (stringOfMode(mode) === 'cpu' ? cpu : gpu).createKernel (
function (camera: number[], lights: number[][], things: number[][],
eyeV: number[], rightV: number[], upV: number[],
halfHeight: number, halfWidth: number,
Expand Down Expand Up @@ -495,7 +495,7 @@ let createKernel = (mode) => {
// Default canvas background colour
this.color (0.95, 0.95, 0.95)
}
}, opt (mode))
}, opt ())

return kernel
}
Expand Down
1 change: 1 addition & 0 deletions vendor/gpu.d.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
declare class GPU {
constructor(options?: any)
public addFunction(f: any)
public createKernel (f: any, opt?: any): any
}
44 changes: 0 additions & 44 deletions vendor/gpu.min.js

This file was deleted.