Quasi-periodic and Non-periodic Waves in (2+1)-Dimensional Nonlinear Systems