GitHub - shirelga/ex2

Branches Tags

Name		Name	Last commit message	Last commit date
Latest commit History 1 Commit
shaders		shaders
textures		textures
Circle.cpp		Circle.cpp
Circle.h		Circle.h
Makefile		Makefile
Model.cpp		Model.cpp
Model.h		Model.h
OpenMeshObject.cpp		OpenMeshObject.cpp
OpenMeshObject.h		OpenMeshObject.h
ShaderIO.cpp		ShaderIO.cpp
ShaderIO.h		ShaderIO.h
bimage.h		bimage.h
ex2.cpp		ex2.cpp
ex2.h		ex2.h
readme.txt		readme.txt

Repository files navigation

jadams 777635004
shirelga 201299344

Description
***********
Solution to ex2c, implementing textures.

Files:
******
ex2.cpp
ex2.h
bimage.h
Model.cpp
Model.h
ShaderIO.cpp
ShaderIO.h
Circle.h
Circle.cpp
OpenMeshObject.cpp
OpenMeshObject.h
Makefile
Shaders:
CircleShader.frag
CircleShader.vert
OpenMeshShader.frag (plain colour)
OpenMeshShader.vert (plain colour)
OpenMeshShaderPhong.frag
OpenMeshShaderPhong.vert
OpenMeshShaderGouraud.frag
OpenMeshShaderGouraud.vert
BrickShader.frag
BrickShader.vert
MarbleShader.frag
MirorShader.frag
MirorShader.vert
WoodShader.frag
Textures:
brickwork-bump-map.bmp
brickwork-texture.bmp
spheremap2.bmp

Started code using previous ex2b solution.
Implemented Marble, Wood, Mirror and Brick textures, i.e everything requested in the project spec.
Not including glow.

Changes made to original code:
-functionality for more shaders.
-functionality for textures (based on supplied code)
-functionality for the extra keyboard operations.
-new shaders written

Shaders implemented as requested, following recommendations from the project spec.