CPE476Lab1

How to use git

git add . --all git commit -m "message" git fetch git rebase origin/master While there are merge conflicts: modify code manually until it is working properly git add . --all git commit -m "message" git rebase --continue git push

Cross-Platform Building

This project supports janky builds on macs, linux, and the CSL machines.
IF YOU WANT TO CHANGE includes.h BE SURE TO MODIFY YOUR RESPECTIVE INCLUDES FILE.
For instance, if you are on a CSL machine, change includes_csl.h.

To build the standard build, run
make
To build the CSL build, run
make csl

Creating the path variable for freetype2:

First install freetype here
Find the path:
     freetype-config --cflags
Copy the path in the output

Add line into ~/.profile like this:
     export FREETYPE_DIR=paste here
Adding this line into ~/.profile will run the export command every time you open a new terminal.

Without restarting your terminal, or if things aren't working, try:
     source ~/.profile
Makefile should work at this point

Issue Tracking

Go to BitBucket

Name		Name	Last commit message	Last commit date
Latest commit History 386 Commits
CMakeFiles		CMakeFiles
Fonts		Fonts
GL		GL
build/CMakeFiles		build/CMakeFiles
freeglut-3.0.0		freeglut-3.0.0
freetype-2.5.5		freetype-2.5.5
glew-1.12.0		glew-1.12.0
glm		glm
irrKlang-1.5.0		irrKlang-1.5.0
irrKlang-64bit-1.5.0		irrKlang-64bit-1.5.0
objs		objs
shaders		shaders
sounds		sounds
textures		textures
videos		videos
.DS_Store		.DS_Store
.gitignore		.gitignore
Booth.cpp		Booth.cpp
Booth.h		Booth.h
CMakeCache.txt		CMakeCache.txt
CMakeLists.txt		CMakeLists.txt
Camera.cpp		Camera.cpp
Camera.h		Camera.h
Clickable.h		Clickable.h
Clicks.cpp		Clicks.cpp
Clicks.h		Clicks.h
Extra.h		Extra.h
FontAtlas.cpp		FontAtlas.cpp
FontAtlas.h		FontAtlas.h
FontEngine.cpp		FontEngine.cpp
FontEngine.h		FontEngine.h
GLSL.cpp		GLSL.cpp
GLSL.h		GLSL.h
Karaoke.cpp		Karaoke.cpp
Karaoke.h		Karaoke.h
Makefile		Makefile
Makefile.new		Makefile.new
Makefile_mac		Makefile_mac
Makefile_ubuntu		Makefile_ubuntu
Makefile_unix		Makefile_unix
MatrixStack.cpp		MatrixStack.cpp
MatrixStack.h		MatrixStack.h
Minigame.cpp		Minigame.cpp
Minigame.h		Minigame.h
Object.cpp		Object.cpp
Object.h		Object.h
Particle.cpp		Particle.cpp
Particle.h		Particle.h
ParticleSorter.h		ParticleSorter.h
ParticleTexture.cpp		ParticleTexture.cpp
ParticleTexture.h		ParticleTexture.h
Program.cpp		Program.cpp
Program.h		Program.h
README.md		README.md
Session.cpp		Session.cpp
Session.h		Session.h
ShootingGallery.cpp		ShootingGallery.cpp
ShootingGallery.h		ShootingGallery.h
Shop.cpp		Shop.cpp
Shop.h		Shop.h
SkyBox.cpp		SkyBox.cpp
SkyBox.h		SkyBox.h
Sound.cpp		Sound.cpp
Sound.h		Sound.h
Texture.cpp		Texture.cpp
Texture.h		Texture.h
Util.h		Util.h
WatermelonSmash.cpp		WatermelonSmash.cpp
WatermelonSmash.h		WatermelonSmash.h
Window.cpp		Window.cpp
Window.h		Window.h
World.cpp		World.cpp
World.h		World.h
bunny.obj		bunny.obj
cmake_install.cmake		cmake_install.cmake
cube.obj		cube.obj
fonts.txt		fonts.txt
freeglut.h		freeglut.h
glew.h		glew.h
glfw3.h		glfw3.h
glfw3.pc		glfw3.pc
glfw3_1.h		glfw3_1.h
glut.h		glut.h
includes.h		includes.h
includes_csl.h		includes_csl.h
includes_ubuntu.h		includes_ubuntu.h
krkinstr.txt		krkinstr.txt
libGLEW_x32.a		libGLEW_x32.a
libGLEW_x64.a		libGLEW_x64.a
libSOIL.a		libSOIL.a
libglfw3_x32.a		libglfw3_x32.a
libglfw3_x64.a		libglfw3_x64.a
main.cpp		main.cpp
map.txt		map.txt
puns.txt		puns.txt
sginstr.txt		sginstr.txt
shopinstr.txt		shopinstr.txt
songs.txt		songs.txt
sphere.obj		sphere.obj
textures.txt		textures.txt

RetroRebirth/CPE476_JapaneseFestival

Folders and files

Latest commit

History