added 3d scene and some other camera stuff
merging from main