Skip to content

Texture & Material#3

Open
Quentin01 wants to merge 62 commits intomasterfrom
texture
Open

Texture & Material#3
Quentin01 wants to merge 62 commits intomasterfrom
texture

Conversation

@Quentin01
Copy link
Collaborator

No description provided.

@Quentin01 Quentin01 changed the title Texture Texture & Material Feb 8, 2016
Nokitoo and others added 30 commits February 13, 2016 16:22
PngImageLoader & JpgImageLoader
# Conflicts:
#	DirectX12FromScratch.sln
#	DirectX12FromScratch/Assets/shaders/ps.hlsl
#	DirectX12FromScratch/DirectX12FromScratch.vcxproj.filters
#	DirectX12FromScratch/src/MainApplication.cpp
…o texture

# Conflicts:
#	DirectX12FromScratch/src/MainApplication.cpp
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants