|
|
924b32e70a
|
Fixed quite a few issues with the prop instance merger's logic.
|
2021-08-10 12:23:53 +02:00 |
|
|
|
6a4c4ad1aa
|
Also clear the nodes if _prop_data is not valid.
|
2021-08-10 10:55:49 +02:00 |
|
|
|
9320f0c3c4
|
Reset the meshes even if _prop_data is not valid.
|
2021-08-10 10:53:22 +02:00 |
|
|
|
4ee6f2b033
|
Remove private _prop_data property.
|
2021-08-10 10:41:14 +02:00 |
|
|
|
ccc94053d6
|
Fix ref's type.
|
2021-08-10 10:40:56 +02:00 |
|
|
|
ef7b217b6a
|
Actually queue the build in queue_build.
|
2021-08-10 10:29:52 +02:00 |
|
|
|
8e9c865285
|
Fix build.
|
2021-08-10 10:20:27 +02:00 |
|
|
|
7c815f26b0
|
Removed the merge_textures property from PropInstanceMerger.
|
2021-08-10 10:19:03 +02:00 |
|
|
|
0d4d55278f
|
Set up job steps in PropInstanceMerger.
|
2021-08-10 10:13:16 +02:00 |
|
|
|
33cc53c881
|
Implement initial_setup_default for PropMaterialCache and PropMaterialCachePCM.
|
2021-08-10 10:06:13 +02:00 |
|
|
|
5477c38e3f
|
Added missing material_get to PropCache.
|
2021-08-10 10:01:41 +02:00 |
|
|
|
387c6fdedd
|
Set cache to the job and implement cache initialization for in PropInstanceMerger's _build.
|
2021-08-10 09:57:37 +02:00 |
|
|
|
604d895ac9
|
Improve stage logic a bit.
|
2021-08-10 09:49:22 +02:00 |
|
|
|
6ec8e40ea0
|
Get the material from the material cache.
|
2021-08-10 09:46:59 +02:00 |
|
|
|
34492756cd
|
Removed the old (commented out) lod generation code, and the mesh setup code. phase_steps handles this .
|
2021-08-10 09:45:25 +02:00 |
|
|
|
64e6447d9c
|
Removed the texture packer from PropInstancePropJob. The code now uses the material cache instead.
|
2021-08-10 09:39:18 +02:00 |
|
|
|
35cf1962d0
|
Undef PROPS_PRESENT just in case.
|
2021-08-10 09:29:08 +02:00 |
|
|
|
8805d63f4a
|
Added a material_cache property to PropInstancePropJob.
|
2021-08-10 09:28:06 +02:00 |
|
|
|
f526e99239
|
Fix error message copy paste.
|
2021-08-10 09:22:13 +02:00 |
|
|
|
d670f8a968
|
Implement material_cache_unref and material_cache_custom_key_unref aswell.
|
2021-08-10 09:21:32 +02:00 |
|
|
|
9ea2951c66
|
Added ensure_materials_loaded method to PropCache.
|
2021-08-09 21:05:36 +02:00 |
|
|
|
cbad187673
|
Implement material loading.
|
2021-08-09 21:01:46 +02:00 |
|
|
|
4bde4a4638
|
Prop cache now also can store the materials themselves.
|
2021-08-09 20:55:40 +02:00 |
|
|
|
f9d5a4c29a
|
Added a material_paths property to the PropCache, can be used to store resource paths to the materials.
|
2021-08-09 20:43:53 +02:00 |
|
|
|
d59047eb7c
|
Added texture packer options for PropMaterialCachePCM to the PropCache singleton. It reads default values from the project settings.
|
2021-08-09 20:35:28 +02:00 |
|
|
|
145e67481b
|
Fix build.
|
2021-08-09 20:34:28 +02:00 |
|
|
|
f3d1e5278c
|
Added initial_setup_default virtual to prop material cache.
|
2021-08-09 20:24:29 +02:00 |
|
|
|
7a3e3b20d4
|
Added a mutex with a public api to the material cache.
|
2021-08-09 17:21:19 +02:00 |
|
|
|
11b82bded3
|
Removed the old TexturePacker based api from PropCache.
|
2021-08-09 17:16:05 +02:00 |
|
|
|
b15ac01225
|
Added an api to get MaterialCaches from the PropCache singleton. Also changed toe default_prop_material_cache_class property's type to stringname.
|
2021-08-09 16:56:11 +02:00 |
|
|
|
e0db2189be
|
Added default_prop_material_cache_class property to the PropCache singleton.
|
2021-08-09 16:18:34 +02:00 |
|
|
|
e34649c44f
|
Don't check for PROPS_PRESENT in the props module.
|
2021-08-09 16:10:15 +02:00 |
|
|
|
fea813eae3
|
Renamed the PropTextureCache singleton to PropCache.
|
2021-08-09 15:57:21 +02:00 |
|
|
|
fca5abaa5d
|
Brought in the step code from Terraman. Not yet finished, but it compiles.
|
2021-08-09 13:15:20 +02:00 |
|
|
|
6c8deb8956
|
Ported the MaterialCache class from Terraman.
|
2021-08-09 13:13:21 +02:00 |
|
|
|
33095a83a1
|
Added the job steps api to PropInstancePropJob.
|
2021-08-09 11:30:52 +02:00 |
|
|
|
3c20bd4ec6
|
Moved PropMesherJobStep to the jobs folder.
|
2021-08-09 11:23:40 +02:00 |
|
|
|
0eee4dba90
|
Cleaned up prop instance job and prop instance merger. All the necessary logic (for the time being) is there. It still needs some fixes though.
|
2021-05-21 15:33:29 +02:00 |
|
|
|
688499cca0
|
Actually queue up the job in prop instance merger.
|
2021-05-20 20:33:39 +02:00 |
|
|
|
a364f91bd5
|
Set up job's texture packer property.
|
2021-05-20 19:16:25 +02:00 |
|
|
|
243ddc2faf
|
Now the prop instance job now holds an array of PropDataMeshDatas with their base transforms. Also PropInstanceMerger will now add all mesh data resources to the job when processing the prop.
|
2021-05-20 19:09:00 +02:00 |
|
|
|
a0d9404201
|
Added texture packer property to the prop instance job.
|
2021-05-20 18:58:09 +02:00 |
|
|
|
aca6a61c3d
|
Added a PropTextureCache singleton, and a PropTextureJob class.
|
2021-05-17 22:27:10 +02:00 |
|
|
|
40201207f5
|
Material support for the Propinstance.
|
2021-04-27 17:32:33 +02:00 |
|
|
|
446b526f57
|
Light support for Propinstance.
|
2021-04-27 17:17:31 +02:00 |
|
|
|
5b71d7a931
|
Reimplemented mesh data instance creation in _prop_preprocess. Also don't set owners, so things won't show up in the editor.
|
2021-04-27 17:06:46 +02:00 |
|
|
|
8667cc8eaf
|
Made prop_preprocess overrideable.
|
2021-04-27 16:52:36 +02:00 |
|
|
|
cbb2028d64
|
Split PropInstance into PropInstance and PropInstanceMerger.
|
2021-04-27 16:47:46 +02:00 |
|
|
|
dbc9529f21
|
Added a virtual _build method to PropInstance.
|
2021-04-27 16:29:09 +02:00 |
|
|
|
e6cc2625e4
|
Mostly ported prop processing code from voxelman.
|
2021-04-27 13:50:51 +02:00 |
|
