Resolve controller merge conflicts

cginternals / webgl-operate

A TypeScript based WebGL rendering framework.

https://webgl-operate.org

MIT License

166 stars 25 forks source link

Resolve controller merge conflicts #248

Closed Zanthelo closed 4 years ago

Zanthelo commented 4 years ago

Resolves merge conflicts inside controller preventing merge of handle_context_lost_events into master. Also changes canvas to work with the new controller.

This does not fix the build errors of the demos and examples.

Zanthelo commented 4 years ago

Obsolete