Skip to content

Commit

Permalink
Fixed the ridiculous line ending problems (I think)
Browse files Browse the repository at this point in the history
  • Loading branch information
Checkmate50 committed Apr 25, 2019
1 parent 5051bf2 commit 44e6fe7
Show file tree
Hide file tree
Showing 593 changed files with 672 additions and 672 deletions.
Empty file modified examples/auto_phong/fragment.lgl
100755 → 100644
Empty file.
Empty file modified examples/auto_phong/index.html
100755 → 100644
Empty file.
Empty file modified examples/auto_phong/main.ts
100755 → 100644
Empty file.
Empty file modified examples/auto_phong/vertex.lgl
100755 → 100644
Empty file.
Empty file modified examples/bump/fragment.lgl
100755 → 100644
Empty file.
Empty file modified examples/double_phong/fragment1.lgl
100755 → 100644
Empty file.
Empty file modified examples/double_phong/fragment2.lgl
100755 → 100644
Empty file.
Empty file modified examples/double_phong/index.html
100755 → 100644
Empty file.
Empty file modified examples/double_phong/main.ts
100755 → 100644
Empty file.
Empty file modified examples/double_phong/vertex1.lgl
100755 → 100644
Empty file.
Empty file modified examples/double_phong/vertex2.lgl
100755 → 100644
Empty file.
Empty file modified examples/multiobject/frag_blue_light.lgl
100755 → 100644
Empty file.
Empty file modified examples/multiobject/frag_green_light.lgl
100755 → 100644
Empty file.
Empty file modified examples/multiobject/frag_main.lgl
100755 → 100644
Empty file.
Empty file modified examples/multiobject/frag_red_light.lgl
100755 → 100644
Empty file.
Empty file modified examples/multiobject/index.html
100755 → 100644
Empty file.
Empty file modified examples/multiobject/main.ts
100755 → 100644
Empty file.
Empty file modified examples/multiobject/vertex.lgl
100755 → 100644
Empty file.
Empty file modified examples/package.json
100755 → 100644
Empty file.
Empty file modified examples/resources/OBJ/sphere_highres.obj
100755 → 100644
Empty file.
Empty file modified examples/resources/OBJ/teapot.obj
100755 → 100644
Empty file.
Empty file modified examples/resources/lpshead/Infinite-Scan_License.txt
100755 → 100644
Empty file.
Empty file modified examples/resources/lpshead/head.OBJ
100755 → 100644
Empty file.
Empty file modified examples/resources/lpshead/head.mtl
100755 → 100644
Empty file.
Empty file modified examples/resources/lpshead/lambertian.jpg
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified examples/resources/textures/Flower.png
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified examples/resources/textures/earthbump1k.jpg
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified examples/resources/textures/earthmap1k.jpg
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified examples/shadow_map/fragment.lgl
100755 → 100644
Empty file.
Empty file modified examples/shadow_map/index.html
100755 → 100644
Empty file.
Empty file modified examples/shadow_map/main.ts
100755 → 100644
Empty file.
Empty file modified examples/shadow_map/shadowfragment.lgl
100755 → 100644
Empty file.
Empty file modified examples/shadow_map/shadowvertex.lgl
100755 → 100644
Empty file.
Empty file modified examples/shadow_map/vertex.lgl
100755 → 100644
Empty file.
Empty file modified examples/spotlight/fragment.lgl
100755 → 100644
Empty file.
Empty file modified examples/spotlight/index.html
100755 → 100644
Empty file.
Empty file modified examples/spotlight/main.ts
100755 → 100644
Empty file.
Empty file modified examples/spotlight/vertex.lgl
100755 → 100644
Empty file.
Empty file modified examples/swamp/fragment.lgl
100755 → 100644
Empty file.
Empty file modified examples/swamp/index.html
100755 → 100644
Empty file.
Empty file modified examples/swamp/main.ts
100755 → 100644
Empty file.
Empty file modified examples/swamp/source.txt
100755 → 100644
Empty file.
Empty file modified examples/swamp/vertex.lgl
100755 → 100644
Empty file.
Empty file modified examples/tagged_phong/fragment.lgl
100755 → 100644
Empty file.
Empty file modified examples/tagged_phong/index.html
100755 → 100644
Empty file.
Empty file modified examples/tagged_phong/main.ts
100755 → 100644
Empty file.
Empty file modified examples/tagged_phong/vertex.lgl
100755 → 100644
Empty file.
Empty file modified examples/texture_obj/fragment.lgl
100755 → 100644
Empty file.
Empty file modified examples/texture_pkg/fragment.lgl
100755 → 100644
Empty file.
Empty file modified examples/untagged_phong/fragment.lgl
100755 → 100644
Empty file.
Empty file modified examples/untagged_phong/index.html
100755 → 100644
Empty file.
Empty file modified examples/untagged_phong/main.ts
100755 → 100644
Empty file.
Empty file modified examples/untagged_phong/vertex.lgl
100755 → 100644
Empty file.
Empty file modified examples/wavy/fragment.lgl
100755 → 100644
Empty file.
Empty file modified examples/wavy/index.html
100755 → 100644
Empty file.
Empty file modified examples/wavy/main.ts
100755 → 100644
Empty file.
Empty file modified examples/wavy/vertex.lgl
100755 → 100644
Empty file.
Empty file modified harness/benchmarks/reflection/index.html
100755 → 100644
Empty file.
Empty file modified harness/benchmarks/resources/lpshead/Infinite-Scan_License.txt
100755 → 100644
Empty file.
Empty file modified harness/benchmarks/resources/lpshead/head.OBJ
100755 → 100644
Empty file.
Empty file modified harness/benchmarks/resources/lpshead/head.mtl
100755 → 100644
Empty file.
Empty file modified harness/benchmarks/resources/lpshead/lambertian.jpg
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified harness/benchmarks/shadow_map/default/fragment.lgl
100755 → 100644
Empty file.
Empty file modified harness/benchmarks/shadow_map/default/shadowfragment.lgl
100755 → 100644
Empty file.
Empty file modified harness/benchmarks/shadow_map/default/shadowvertex.lgl
100755 → 100644
Empty file.
Empty file modified harness/benchmarks/shadow_map/default/vertex.lgl
100755 → 100644
Empty file.
Empty file modified harness/benchmarks/shadow_map/index.html
100755 → 100644
Empty file.
Empty file modified harness/benchmarks/shadow_map/main.ts
100755 → 100644
Empty file.
Empty file modified harness/benchmarks/texture/default/fragment.lgl
100755 → 100644
Empty file.
Empty file modified harness/combine.sh
100755 → 100644
Empty file.
Empty file modified harness/count.sh
100755 → 100644
Empty file.
Empty file modified scripts/init.py
100755 → 100644
Empty file.
Empty file modified scripts/templates/index.html
100755 → 100644
Empty file.
Empty file modified scripts/templates/types.d.ts
100755 → 100644
Empty file.
88 changes: 44 additions & 44 deletions src/coreAst.ml
Original file line number Diff line number Diff line change
@@ -1,45 +1,45 @@
(* Standard type definitions*)
type id = string
type vec = float list
type mat = vec list

type constvar =
| ConstInt of int
| ConstVar of id

(* values *)
type value =
| Unit
| Bool of bool
| Num of int
| Float of float
| VecLit of vec
| MatLit of mat

type unop =
| Neg
| Not
| Swizzle of id
type binop =
| Eq
| Leq
| Lt
| Geq
| Gt
| Or
| And
| Plus
| Minus
| Times
| Div
| CTimes (* Component-wise multiplication *)
| Index

(* Storage qualifiers *)
type storage_qual =
| In
| Out
| Const
| Attribute
| Uniform
(* Standard type definitions*)
type id = string
type vec = float list
type mat = vec list

type constvar =
| ConstInt of int
| ConstVar of id

(* values *)
type value =
| Unit
| Bool of bool
| Num of int
| Float of float
| VecLit of vec
| MatLit of mat

type unop =
| Neg
| Not
| Swizzle of id
type binop =
| Eq
| Leq
| Lt
| Geq
| Gt
| Or
| And
| Plus
| Minus
| Times
| Div
| CTimes (* Component-wise multiplication *)
| Index

(* Storage qualifiers *)
type storage_qual =
| In
| Out
| Const
| Attribute
| Uniform
| Varying
Loading

0 comments on commit 44e6fe7

Please sign in to comment.