how many different shapes do you see?

Lets see here...I see:
8 full triangles
12 ALMOST triangles and
3 squares

Am I right!?! Thanks for the fun! ~:)

I see 24 triangles and six squares. Nice puzzle!

Dont forget the diamonds.

Thanks.