Paths

Table of Contentst

Ptex rendering/painting
Needs RevisionPublic
Actions

Authored by Nicholas Bishop (nicholasbishop) on Feb 6 2015, 5:32 PM.

Details

Reviewers

Sergey Sharybin (sergey)
Antonis Ryakiotakis (psy-fi)

Commits

rB87f3139a4140: Temporary hack to ensure packed image pointer
rB57ee82d61b5e: Hacky fix for saving texpaint ptex changes
rB8e3449cd1a13: Add Ptex mesh operators
rB99a40c59b24d: Add initial Ptex support to texture paint mode
rB990a2748c4c1: Add Ptex to mesh-data UI
rB847e90c531e7: Allow ptex node to be a texpaint slot
rBad1293f636fa: Update Blend file saving/loading for Ptex
rB6ab32269205e: Add Ptex UV interpolation to subsurf modifier
rB7bc964b4f994: Add Ptex infrastructure to GPU module
rB29f3e1374b3b: Add support for GPU drawing of Ptex textures to image node
rB964285c25e29: Add Ptex support to Cycles image node, also add Ptex node
rBc50694060db8: Add Ptex shader node
rB4d7e0d3cd733: Add loading of Ptex UVs and layer data in Cycles
rBf59d0f9f3ca5: Update DerivedMesh for Ptex drawing/rendering
rB3625fb6bfd45: RNA updates for Ptex
rBfd923fcefba9: Tesselation for Ptex loop layer
rB677c606dcb61: Add new CustomData layers for Ptex
rBf4317a97891a: Move Cycles' Ptex attribute from vertices to corners
rBbc5fa16ddbfb: Add basic Ptex reading via OIIO to ImBuf
rBb1cdf58286b5: Add API for packing Ptex faces into a single large image

Summary

First pass at supporting Ptex in Blender. Code is not at all in a
finished state, currently there are over 100 "TODO" comments and
probably should be even more :) But I think it's far enough that it
can get some productive review about overall design.

See individual commits for a bit more detail, and also have a look at
documentation on the wiki here:
http://wiki.blender.org/index.php/User:Nicholasbishop/Ptex#Implementation

Diff Detail

Repository: rB Blender
Branch: cycles-ptex-49

Event Timeline

Nicholas Bishop (nicholasbishop) updated this revision to Diff 3386.Feb 6 2015, 5:32 PM

Nicholas Bishop (nicholasbishop) retitled this revision from to First pass at supporting Ptex in Blender. Code is not at all in a finished state, currently there are over 100 "TODO" comments and probably should be even more :) But I think it's far enough that it can get some productive review about overall....

Nicholas Bishop (nicholasbishop) updated this object.

Nicholas Bishop (nicholasbishop) retitled this revision from First pass at supporting Ptex in Blender. Code is not at all in a finished state, currently there are over 100 "TODO" comments and probably should be even more :) But I think it's far enough that it can get some productive review about overall... to Ptex rendering/painting.Feb 6 2015, 5:34 PM

Nicholas Bishop (nicholasbishop) updated this object.

Nicholas Bishop (nicholasbishop) added reviewers: Antonis Ryakiotakis (psy-fi), Sergey Sharybin (sergey), Campbell Barton (campbellbarton).

Closed by commit rBb1cdf58286b5: Add API for packing Ptex faces into a single large image (authored by Nicholas Bishop (nicholasbishop)). · Explain WhyFeb 6 2015, 5:35 PM

This revision was automatically updated to reflect the committed changes.

Reopening, silly phabricator.

Ronny G (nutel) added a subscriber: Ronny G (nutel).Feb 6 2015, 6:43 PM

Juicyfruit noted in IRC that part of the diff isn't showing up here. I have no idea why... the cycles-ptex-49 branch in git should be fully up to date, however.

Syncing diff with the updated branch

/me cross fingers that I'm doing correct arc options

Compilation fix for game engine
Fix linker error in blenderplayer
Merge remote-tracking branch 'origin/master' into cycles-ptex-49
Minor code cleanups for Ptex
Minor code cleanups for Ptex
Move some of the Ptex code behind a WITH_PTEX ifdef
Merge remote-tracking branch 'origin/master' into cycles-ptex-49
Minor includes cleanup in bke_ptex.c
Naming cleanup: better consistency in extern/ptex
Add missing OIIO include dirs for CMake in extern/ptex
Improve performance of mesh iteration in ptex_pack_loops
Ptex+Cuda compilation fix
Merge remote-tracking branch 'origin/master' into cycles-ptex-49
Minor TODO fix, rename PtexDataType -> MPtexDataType
Ptex+Cuda fix, use kernel_assert instead of assert
Potential Ptex+Cuda fix, adjust number of GPU texture slots
Bring back __tex_image_150 on DingTo's advice
Ptex+Cuda: update the svm_image_texture switch
Fix crash in Ptex+Cycles
Make default Ptex layer a better color than flat black
Ptex SCons include tweaks
Ptex: fix memory leak from subsurf cache
Use file browser instead of hardcoded path in Ptex import operator
Add Ptex extension (ptx) to imb_ext_image array
Use filename as the new layer name in Ptex import operator
Set "*.ptx" filter glob for Ptex import operator
Select new layer after importing a Ptex layer
Merge remote-tracking branch 'origin/master' into cycles-ptex-49
Ptex+OSL compilation fix, change ifdef guard for older Ptex code
Merge remote-tracking branch 'origin/master' into cycles-ptex-49
Fix ImBuf memory leak in Ptex

Preliminary review with some tidbits. I can't say a lot about cycles, but I think texpaint could use a little more refinement - I didn't see if there are UI for switching between ptex/texture workflows yet.

I will be trying a compile later to see how it works and feels in general.

intern/cycles/render/nodes.cpp
558	Are those relevant? AFAIK ptex has its own generated coordinates always..
source/blender/blenkernel/intern/subsurf_ccg.c
3847	Still needed?
source/blender/editors/sculpt_paint/paint_image_proj.c
3659	Probably you can reuse the original mtface pointer here, it doesn't really make sense to keep both since we either paint on a regular slot or a ptex slot.
source/blender/gpu/intern/gpu_codegen.c
838	Generally, having the Material system depend on the object is not very nice (makes reusing the materials harder and requires rebinding each time we change the object)
source/blender/makesdna/DNA_customdata_types.h
126	If the loop data structures don't make sense outside ptex then combining them to one struct might make more sense.

Antonis Ryakiotakis (psy-fi) requested changes to this revision.Feb 9 2015, 4:10 PM

Antonis Ryakiotakis (psy-fi) edited edge metadata.

This revision now requires changes to proceed.Feb 9 2015, 4:10 PM

Currently, texture creation in texture paint mode creates corresponding nodes in material and adding simple UVs can be done by pressing one button.
And user can directly paint on it.

In ptex branch, user have to create Ptex layer, to create, to connect the Ptex Texture node to a diffuse node and to fill it with Ptex Layer name before being able to paint.
Ptex layer display in 3D Viewport is only possible in Material View. So, it is sensible to material settings. There is no single Ptex Layer display as for texture.
It seems that painting of ptex layer and image texture is not supported.
Active Material Slot cannot be changed. You cannot switch from a Ptex layer to an UVmap texture.

No matter what Ptex layer node is selected in material, you are painting on active slot in mesh properties.

Initial set of comments. Was mainly looking into Cycles side and only briefly scrolled through rest of the code.

There are also quite enough of TODOs marked by you which probably will be easier for you to grep through the sources.

extern/ptex/BPX_packed_layout.h
137	Tip: use wither `_` suffix (matching libmv/ceres) or `m_` prefix (matching compositor) for private members.
extern/ptex/bpx_c_api.cpp
12	Ouch.. What's this is for?
22	For master would suggest dropping dead code (or maybe comment that it'll be used later?)
intern/cycles/CMakeLists.txt
134	Would need to be adjusted for standalone repository, but that's easier to worry about after the merge.
intern/cycles/SConscript
88	Can this two blocks be de-duplicated?
intern/cycles/blender/blender_mesh.cpp
418	What `spi` means?
intern/cycles/blender/blender_session.cpp
104	Just thinking loud.. Did anyone look into a way to give placeholders more reasonable names?
958	Seems to be really bad idea. Can't it be handled properly in NA level?
intern/cycles/blender/blender_shader.cpp
599	Seems it's actually the same as adding image node with .ptx file?
intern/cycles/kernel/kernel_types.h
537	Since this is pure run=time code, what about grouping PTex attributes together?
intern/cycles/kernel/osl/osl_services.cpp
53	Hrm. Seems you can enable PTex for SVM and keep it disabled for OSL? Is there really need to such a granularity?
intern/cycles/kernel/svm/svm_image.h
385	What all this is about? =\
402	Some magic bits..
408	...And some more magic numbers...
430	So far this is biggest concern in the kernel code.. Can it be cleaned up?
intern/cycles/render/image.cpp
31	Would suggest using indentation of nested preprocessor: #if FOO # include "bar" #endif
805	Now i kinda see why you passed dscene in there. Perhaps name would need to be adjusted. Would need to have a closer look to fully understand the code. o have feeling it could simplified/cleaned but cant' really give actual feedback yet :)
intern/cycles/render/image.h
105	This sounds a bit weird. File I/O shouldn't really depend on device and device-specific code is to be part of device_* functions. Otherwise i smell some headache for persistent data case..
intern/cycles/render/nodes.cpp
472	Can't this flags be passed via SVM nodes?
source/blender/blenkernel/intern/bke_ptex.c
1	Name is a bit weird. We've got BLI_ prefix for files in blenlib, or we just don't put module into the name. So would suggest either BKE_ptex.c (which would be first file with such prefix in BKE) or simply ptex.c.
139	Oh geez. That's becoming crazy and that's why i like to put todo's description when just writing them. Helping to understand how important the thing is and if you're keeping the same thing to be changed in mind. So you'll need to go over the TODOs and double-check if they're stoppers from your POV or not..
337	Ok question, what if we'll want to extend those structures? :)
379	Would need to ask @Campbell Barton (campbellbarton).
source/blender/editors/sculpt_paint/paint_image_proj.c
3743	Interesting, is it part of other fix or so?

Erick Tukuniata (erickblender) added a subscriber: Erick Tukuniata (erickblender).Mar 13 2015, 12:48 PM

What's the status on this Ptex work? Sorry if I missed another thread where conclusions were made.

Campbell Barton (campbellbarton) removed a reviewer: Campbell Barton (campbellbarton).Aug 11 2016, 6:12 AM

Revision Contents
Changeset List

Path

Size

CMakeLists.txt

2 lines

build_files/

cmake/

config/

blender_lite.cmake

1 line

macros.cmake

1 line

scons/

config/

darwin-config.py

2 lines

linux-config.py

2 lines

win32-mingw-config.py

2 lines

win32-vc-config.py

2 lines

win64-mingw-config.py

2 lines

win64-vc-config.py

2 lines

tools/

btools.py

4 lines

extern/

CMakeLists.txt

4 lines

SConscript

3 lines

ptex/

144 lines

148 lines

47 lines

15 lines

1260 lines

intern/

cycles/

CMakeLists.txt

3 lines

SConscript

5 lines

blender/

addon/

1 line

110 lines

5 lines

21 lines

12 lines

kernel/

kernel_textures.h

5 lines

kernel_types.h

1 line

osl/

osl_services.cpp

8 lines

svm/

svm_image.h

54 lines

render/

7 lines

9 lines

150 lines

26 lines

219 lines

3 lines

util/

util_types.h

2 lines

release/

scripts/

startup/

bl_ui/

properties_data_mesh.py

34 lines

nodeitems_builtins.py

1 line

source/

blender/

blenkernel/

7 lines

1 line

91 lines

7 lines

4 lines

intern/

59 lines

1099 lines

64 lines

26 lines

39 lines

13 lines

1 line

96 lines

blenloader/

intern/

readfile.c

13 lines

writefile.c

19 lines

editors/

mesh/

mesh_data.c

269 lines

mesh_intern.h

4 lines

mesh_ops.c

4 lines

sculpt_paint/

paint_image_proj.c

62 lines

space_node/

drawnode.c

13 lines

space_view3d/

view3d_draw.c

2 lines

gpu/

GPU_extensions.h

3 lines

GPU_material.h

8 lines

intern/

6 lines

70 lines

7 lines

51 lines

5 lines

shaders/

gpu_shader_material.glsl

21 lines

imbuf/

12 lines

19 lines

17 lines

6 lines

intern/

6 lines

7 lines

7 lines

104 lines

6 lines

makesdna/

DNA_customdata_types.h

13 lines

DNA_image_types.h

1 line

DNA_meshdata_types.h

60 lines

DNA_node_types.h

5 lines

makesrna/

RNA_access.h

4 lines

intern/

rna_image.c

69 lines

rna_mesh.c

131 lines

rna_nodetree.c

12 lines

nodes/

CMakeLists.txt

1 line

NOD_shader.h

1 line

NOD_static_types.h

1 line

shader/

nodes/

node_shader_tex_image.c

35 lines

node_shader_tex_ptex.c

73 lines

blenderplayer/

CMakeLists.txt

1 line

gameengine/

Ketsji/

BL_BlenderShader.cpp

2 lines

Commit	Tree	Parents	Author	Summary	Date
2ba127468647	969b61132116	c76f130e3e4a	Nicholas Bishop	Fix ImBuf memory leak in Ptex	Feb 9 2015, 12:10 PM
c76f130e3e4a	f782ef79860d	ac226cb43eae 5544ded2b513	Nicholas Bishop	Merge remote-tracking branch 'origin/master' into cycles-ptex-49	Feb 9 2015, 12:04 PM
ac226cb43eae	46914aed82f5	ef605fd7f029	Nicholas Bishop	Ptex+OSL compilation fix, change ifdef guard for older Ptex code	Feb 9 2015, 11:53 AM
ef605fd7f029	e08e9ad59ac0	01949c7d59c2 567e147f619b	Nicholas Bishop	Merge remote-tracking branch 'origin/master' into cycles-ptex-49	Feb 9 2015, 11:50 AM
01949c7d59c2	9d6849bbee95	940ffe2dd3da	Nicholas Bishop	Select new layer after importing a Ptex layer	Feb 9 2015, 2:28 AM
940ffe2dd3da	0e868019a043	fcd11373c713	Nicholas Bishop	Set "*.ptx" filter glob for Ptex import operator	Feb 9 2015, 12:48 AM
fcd11373c713	3ac5a2efa129	60460db60657	Nicholas Bishop	Use filename as the new layer name in Ptex import operator	Feb 9 2015, 12:37 AM
60460db60657	3d2dcf0012c9	e2d323e6fef0	Nicholas Bishop	Add Ptex extension (ptx) to imb_ext_image array (Show More…)	Feb 9 2015, 12:20 AM
e2d323e6fef0	f3ed2f1a906c	60ef72e0934d	Nicholas Bishop	Use file browser instead of hardcoded path in Ptex import operator	Feb 9 2015, 12:01 AM
60ef72e0934d	951db629fb27	168f833d94b6	Nicholas Bishop	Ptex: fix memory leak from subsurf cache	Feb 8 2015, 8:29 PM
168f833d94b6	2a7783794748	699465cd3491	Nicholas Bishop	Ptex SCons include tweaks	Feb 8 2015, 8:09 PM
699465cd3491	e624978f7f03	ba653eb49b2a	Nicholas Bishop	Make default Ptex layer a better color than flat black	Feb 8 2015, 7:59 PM
ba653eb49b2a	cfacd81db56e	e582b1cf1a33	Nicholas Bishop	Fix crash in Ptex+Cycles (Show More…)	Feb 8 2015, 7:18 PM
e582b1cf1a33	7c24e0f36af1	4009251a77db	Nicholas Bishop	Ptex+Cuda: update the svm_image_texture switch	Feb 8 2015, 6:37 PM
4009251a77db	f6ae81615428	195138c2525d	Nicholas Bishop	Bring back __tex_image_150 on DingTo's advice	Feb 8 2015, 6:23 PM
195138c2525d	1fe138888512	3d286bd7a14d	Nicholas Bishop	Potential Ptex+Cuda fix, adjust number of GPU texture slots	Feb 8 2015, 6:14 PM
3d286bd7a14d	3498b4bcd329	d59293b16873	Nicholas Bishop	Ptex+Cuda fix, use kernel_assert instead of assert	Feb 8 2015, 5:58 PM
d59293b16873	362d5ce37851	a0efc3eb9470	Nicholas Bishop	Minor TODO fix, rename PtexDataType -> MPtexDataType	Feb 8 2015, 5:55 PM
a0efc3eb9470	558e5197ab34	574032a6d418 0d766aa53270	Nicholas Bishop	Merge remote-tracking branch 'origin/master' into cycles-ptex-49	Feb 8 2015, 5:50 PM
574032a6d418	b10b215c1b21	a6082a1652e9	Nicholas Bishop	Ptex+Cuda compilation fix	Feb 8 2015, 5:45 PM
a6082a1652e9	785403365825	cd99396f55b6	Nicholas Bishop	Improve performance of mesh iteration in ptex_pack_loops	Feb 8 2015, 5:24 PM
cd99396f55b6	7b4d36fc3f5f	ca9d86b2ea8d	Nicholas Bishop	Add missing OIIO include dirs for CMake in extern/ptex	Feb 8 2015, 4:11 PM
ca9d86b2ea8d	2e6a32270844	a9994506cfee	Nicholas Bishop	Naming cleanup: better consistency in extern/ptex	Feb 8 2015, 4:03 PM
a9994506cfee	e3396a1cf659	9c260660eebc	Nicholas Bishop	Minor includes cleanup in bke_ptex.c	Feb 8 2015, 2:22 PM
9c260660eebc	1ffe366ca6f3	858c714d3fe9 51b645a655eb	Nicholas Bishop	Merge remote-tracking branch 'origin/master' into cycles-ptex-49	Feb 8 2015, 2:18 PM
858c714d3fe9	ffe6146174f9	3bba36a9433b	Nicholas Bishop	Move some of the Ptex code behind a WITH_PTEX ifdef (Show More…)	Feb 8 2015, 2:04 AM
3bba36a9433b	3b7e74e8aaae	da9d75afc83c	Nicholas Bishop	Minor code cleanups for Ptex	Feb 7 2015, 10:56 PM
da9d75afc83c	31927af7d871	09cf96417f85	Nicholas Bishop	Minor code cleanups for Ptex	Feb 7 2015, 9:39 PM
09cf96417f85	63f8b188b5da	758c864e1e38 9c9dab095d49	Nicholas Bishop	Merge remote-tracking branch 'origin/master' into cycles-ptex-49	Feb 7 2015, 9:32 PM
758c864e1e38	ecf8eb9d3bde	55d53b5281a2	Nicholas Bishop	Fix linker error in blenderplayer (Show More…)	Feb 7 2015, 9:14 PM
55d53b5281a2	d34d0feace30	87f3139a4140	Nicholas Bishop	Compilation fix for game engine (Show More…)	Feb 7 2015, 9:13 PM
87f3139a4140	c905e72b5311	57ee82d61b5e	Nicholas Bishop	Temporary hack to ensure packed image pointer	Jan 25 2015, 10:48 PM
57ee82d61b5e	ab232abee674	99a40c59b24d	Nicholas Bishop	Hacky fix for saving texpaint ptex changes	Jan 27 2015, 12:07 AM
99a40c59b24d	98c222f63b0d	847e90c531e7	Nicholas Bishop	Add initial Ptex support to texture paint mode	Jan 22 2015, 8:02 PM
847e90c531e7	07a12b3ff5bb	990a2748c4c1	Nicholas Bishop	Allow ptex node to be a texpaint slot	Jan 22 2015, 10:34 PM
990a2748c4c1	23460bac8b8b	8e3449cd1a13	Nicholas Bishop	Add Ptex to mesh-data UI	Jan 25 2015, 10:27 PM
8e3449cd1a13	f25f50be0b0f	ad1293f636fa	Nicholas Bishop	Add Ptex mesh operators (Show More…)	Jan 21 2015, 10:18 PM
ad1293f636fa	990b3cdc5ac8	6ab32269205e	Nicholas Bishop	Update Blend file saving/loading for Ptex	Jan 22 2015, 2:31 PM
6ab32269205e	ed4d23f9d2d9	964285c25e29	Nicholas Bishop	Add Ptex UV interpolation to subsurf modifier	Jan 20 2015, 1:55 PM
964285c25e29	4b4fd52e5935	c50694060db8	Nicholas Bishop	Add Ptex support to Cycles image node, also add Ptex node	Jan 19 2015, 8:04 PM
c50694060db8	e034bab10dc2	29f3e1374b3b	Nicholas Bishop	Add Ptex shader node	Jan 20 2015, 6:42 PM
29f3e1374b3b	0a1ab77bf2f1	7bc964b4f994	Nicholas Bishop	Add support for GPU drawing of Ptex textures to image node	Jan 20 2015, 12:55 PM
7bc964b4f994	01442fd62ed4	4d7e0d3cd733	Nicholas Bishop	Add Ptex infrastructure to GPU module (Show More…)	Jan 19 2015, 8:03 PM
4d7e0d3cd733	c76965f8da1e	f59d0f9f3ca5	Nicholas Bishop	Add loading of Ptex UVs and layer data in Cycles	Jan 19 2015, 4:03 PM
f59d0f9f3ca5	d0f3238911fe	fd923fcefba9	Nicholas Bishop	Update DerivedMesh for Ptex drawing/rendering (Show More…)	Jan 19 2015, 4:02 PM
fd923fcefba9	a8e33665c943	3625fb6bfd45	Nicholas Bishop	Tesselation for Ptex loop layer	Jan 19 2015, 4:01 PM
3625fb6bfd45	61b6d22f40d3	f4317a97891a	Nicholas Bishop	RNA updates for Ptex	Jan 19 2015, 4:01 PM
f4317a97891a	0780a74bdd7f	677c606dcb61	Nicholas Bishop	Move Cycles' Ptex attribute from vertices to corners	Jan 19 2015, 4:00 PM
677c606dcb61	2f1b5772be60	bc5fa16ddbfb	Nicholas Bishop	Add new CustomData layers for Ptex	Jan 19 2015, 3:59 PM
bc5fa16ddbfb	bbbc838bdca5	b1cdf58286b5	Nicholas Bishop	Add basic Ptex reading via OIIO to ImBuf	Jan 19 2015, 8:03 PM
b1cdf58286b5	84bc54ed701e	14dbe1c2611b	Nicholas Bishop	Add API for packing Ptex faces into a single large image (Show More…)	Jan 16 2015, 12:11 PM