search

jamesgregson / pyPolyCSG

A Polyhedral CSG library for Python
Other
17 stars 7 forks source link

Open gl examples #9

Closed dbc closed 11 years ago

dbc commented 11 years ago

Added a second Qt + OpenGL rendering example that includes flat shading and a cleaner implementation. When doing this pull request, I realized that I should have created a topic branch for my previous pull request instead of asking for a merge off my master branch here. I believe that if you pull from this topic branch 'openGlExamples' you will get both examples and can ignore the earlier pull request. Sorry for the confusion. If you need me to re-do something I easily can -- we can sort it out when you get back from vacation.

jamesgregson commented 11 years ago

I probably messed this up, I'm a complete neophyte when it comes to git and github. Anyway, I got your two pull-requests and they look good to me.

dbc commented 11 years ago

Looks OK to me. I was able to pull your master branch down to my workstation, merge, and push back to my public repo master branch. No git errors, anyway.