Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
I
imt2531-exam
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Halvor Bakken Smedås
imt2531-exam
Commits
842abadb
Commit
842abadb
authored
7 years ago
by
Jonas Johan Solsvik
Browse files
Options
Downloads
Plain Diff
Merge branch 'master' of prod3.imt.hig.no:overkill-studios/imt2531-assignment2 into objloader
parents
29426ba7
aa2232bf
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
include/overkill/Parser.hpp
+5
-1
5 additions, 1 deletion
include/overkill/Parser.hpp
src/Parser.cpp
+115
-0
115 additions, 0 deletions
src/Parser.cpp
src/Scene.cpp
+4
-4
4 additions, 4 deletions
src/Scene.cpp
with
124 additions
and
5 deletions
Loading
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
