Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Project_Phoenix
Manage
Activity
Members
Labels
Plan
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Package registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
LuFG VR VIS
VR-Group
Project_Phoenix
Commits
8b394f3b
Commit
8b394f3b
authored
6 years ago
by
Till Petersen-Krauß
Browse files
Options
Downloads
Patches
Plain Diff
Added missing include
parent
249b1e6a
No related branches found
No related tags found
2 merge requests
!163
Feature/#459 default primitives
,
!162
Feature/#459 default primitives
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
library/phx/resources/loaders/generic_mesh_generator.cpp
+2
-0
2 additions, 0 deletions
library/phx/resources/loaders/generic_mesh_generator.cpp
library/phx/resources/resource_manager.cpp
+2
-1
2 additions, 1 deletion
library/phx/resources/resource_manager.cpp
with
4 additions
and
1 deletion
library/phx/resources/loaders/generic_mesh_generator.cpp
+
2
−
0
View file @
8b394f3b
...
...
@@ -22,6 +22,8 @@
#include
"phx/resources/loaders/generic_mesh_generator.hpp"
#include
<string>
#include
<utility>
#include
<memory>
#include
<vector>
...
...
This diff is collapsed.
Click to expand it.
library/phx/resources/resource_manager.cpp
+
2
−
1
View file @
8b394f3b
...
...
@@ -97,7 +97,8 @@ void ResourceManager::RegisterImageResourceExtensions() {
void
ResourceManager
::
RegisterResourceGenerators
()
{
this
->
RegisterResourceType
(
"GEN_MATERIAL"
,
std
::
make_unique
<
GenericMaterialLoader
>
());
this
->
RegisterResourceType
(
"GEN_MESH"
,
std
::
make_unique
<
GenericMeshGenerator
>
());
this
->
RegisterResourceType
(
"GEN_MESH"
,
std
::
make_unique
<
GenericMeshGenerator
>
());
}
}
// namespace phx
This diff is collapsed.
Click to expand it.
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