summaryrefslogtreecommitdiff
path: root/models
diff options
context:
space:
mode:
authorJon Bergli Heier <snakebite@jvnv.net>2011-07-01 17:20:53 +0200
committerJon Bergli Heier <snakebite@jvnv.net>2011-07-02 18:10:14 +0200
commit75a90df8bf7f38e746e021c23248e1607931132c (patch)
treedf2b4f48d5157f775c719192484188a2b0b8a04a /models
parent90d570822f85f70c31f80789ad6791cebd904468 (diff)
Import and render tree models.
Trees are loaded from the new trees.blend using assimp. Tree objects are then received from the server and rendered on the given terrain locations. Each chunk now holds a list of objects and coordinates, which can be used to easily add other models as well. Also moded the GLSL fog code to its own shader which can be linked in different programs.
Diffstat (limited to 'models')
-rw-r--r--models/README3
-rw-r--r--models/trees.blendbin0 -> 3827560 bytes
2 files changed, 3 insertions, 0 deletions
diff --git a/models/README b/models/README
new file mode 100644
index 0000000..5d31225
--- /dev/null
+++ b/models/README
@@ -0,0 +1,3 @@
+File: trees.blend
+License: CC-BY 3.0
+Source: http://opengameart.org/content/low-poly-trees-stumps-branches
diff --git a/models/trees.blend b/models/trees.blend
new file mode 100644
index 0000000..108feb6
--- /dev/null
+++ b/models/trees.blend
Binary files differ