Remove colorMap texture
This commit is contained in:
parent
d72992c26f
commit
023d50a791
4 changed files with 0 additions and 38 deletions
|
@ -1,17 +0,0 @@
|
||||||
{
|
|
||||||
"info" : {
|
|
||||||
"version" : 1,
|
|
||||||
"author" : "xcode"
|
|
||||||
},
|
|
||||||
"properties" : {
|
|
||||||
"origin" : "bottom-left",
|
|
||||||
"interpretation" : "non-premultiplied-colors"
|
|
||||||
},
|
|
||||||
"textures" : [
|
|
||||||
{
|
|
||||||
"idiom" : "universal",
|
|
||||||
"filename" : "Universal.mipmapset"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
|
|
Binary file not shown.
Before Width: | Height: | Size: 37 KiB |
|
@ -1,12 +0,0 @@
|
||||||
{
|
|
||||||
"info" : {
|
|
||||||
"version" : 1,
|
|
||||||
"author" : "xcode"
|
|
||||||
},
|
|
||||||
"levels" : [
|
|
||||||
{
|
|
||||||
"filename" : "ColorMap.png",
|
|
||||||
"mipmap-level" : "base"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
|
@ -34,7 +34,6 @@ class Renderer: NSObject, MTKViewDelegate {
|
||||||
var pipelineState: MTLRenderPipelineState
|
var pipelineState: MTLRenderPipelineState
|
||||||
var normalPipelineState: MTLRenderPipelineState
|
var normalPipelineState: MTLRenderPipelineState
|
||||||
var depthState: MTLDepthStencilState
|
var depthState: MTLDepthStencilState
|
||||||
var colorMap: MTLTexture
|
|
||||||
|
|
||||||
let inFlightSemaphore = DispatchSemaphore(value: maxBuffersInFlight)
|
let inFlightSemaphore = DispatchSemaphore(value: maxBuffersInFlight)
|
||||||
let regenerationSemaphore = DispatchSemaphore(value: 1)
|
let regenerationSemaphore = DispatchSemaphore(value: 1)
|
||||||
|
@ -104,13 +103,6 @@ class Renderer: NSObject, MTKViewDelegate {
|
||||||
depthStateDesciptor.isDepthWriteEnabled = true
|
depthStateDesciptor.isDepthWriteEnabled = true
|
||||||
self.depthState = device.makeDepthStencilState(descriptor:depthStateDesciptor)!
|
self.depthState = device.makeDepthStencilState(descriptor:depthStateDesciptor)!
|
||||||
|
|
||||||
do {
|
|
||||||
colorMap = try Renderer.loadTexture(device: device, textureName: "ColorMap")
|
|
||||||
} catch {
|
|
||||||
print("Unable to load texture. Error info: \(error)")
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
super.init()
|
super.init()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -302,7 +294,6 @@ class Renderer: NSObject, MTKViewDelegate {
|
||||||
}
|
}
|
||||||
|
|
||||||
renderEncoder.setVertexTexture(terrain.generator.outTexture, index: 0)
|
renderEncoder.setVertexTexture(terrain.generator.outTexture, index: 0)
|
||||||
renderEncoder.setFragmentTexture(colorMap, index: TextureIndex.color.rawValue)
|
|
||||||
|
|
||||||
for submesh in terrain.mesh.submeshes {
|
for submesh in terrain.mesh.submeshes {
|
||||||
renderEncoder.drawIndexedPrimitives(type: submesh.primitiveType,
|
renderEncoder.drawIndexedPrimitives(type: submesh.primitiveType,
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue