diff options
Diffstat (limited to 'MeshSketch.hs')
| -rw-r--r-- | MeshSketch.hs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/MeshSketch.hs b/MeshSketch.hs index f1ee612..a153f5e 100644 --- a/MeshSketch.hs +++ b/MeshSketch.hs | |||
| @@ -163,7 +163,8 @@ xzPlaneVector = fromList [ 0,1,0 -- unit normal | |||
| 163 | uploadState :: IsWidget glarea => MeshData -> glarea -> GLStorage -> IO State | 163 | uploadState :: IsWidget glarea => MeshData -> glarea -> GLStorage -> IO State |
| 164 | uploadState obj glarea storage = do | 164 | uploadState obj glarea storage = do |
| 165 | -- load OBJ geometry and material descriptions | 165 | -- load OBJ geometry and material descriptions |
| 166 | (objMesh,mtlLib) <- uploadOBJToGPU obj | 166 | let workarea = BoundingBox (-1.5) (1.5) (-1.5) 1.5 (-1.5) (1.5) |
| 167 | ((objMesh,mtlLib),objscale) <- uploadOBJToGPU (Just workarea) obj | ||
| 167 | -- load materials textures | 168 | -- load materials textures |
| 168 | gpuMtlLib <- uploadMtlLib mtlLib | 169 | gpuMtlLib <- uploadMtlLib mtlLib |
| 169 | -- add OBJ to pipeline input | 170 | -- add OBJ to pipeline input |