From 3be8a9cc117587157d0591194cb085ad825f8986 Mon Sep 17 00:00:00 2001 From: Aaron Brashears Date: Thu, 4 Jan 2007 23:38:26 +0000 Subject: Result of svn merge -r56461:56474 svn+ssh://svn/svn/linden/branches/llscene-shuffle into release. --- indra/llprimitive/lltree_common.h | 30 +++++++++++++++++++ indra/llprimitive/object_flags.h | 61 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 91 insertions(+) create mode 100644 indra/llprimitive/lltree_common.h create mode 100644 indra/llprimitive/object_flags.h (limited to 'indra/llprimitive') diff --git a/indra/llprimitive/lltree_common.h b/indra/llprimitive/lltree_common.h new file mode 100644 index 0000000000..050a7dafa4 --- /dev/null +++ b/indra/llprimitive/lltree_common.h @@ -0,0 +1,30 @@ +/** + * @file lltree_common.h + * @brief LLTree_gene_0 base class + * + * Copyright (c) 2001-$CurrentYear$, Linden Research, Inc. + * $License$ + */ + +// Common data for trees shared between simulator and viewer + +#ifndef LL_LLTREE_COMMON_H +#define LL_LLTREE_COMMON_H + +struct LLTree_gene_0 +{ + // + // The genome for a tree, species 0 + // + U8 scale; // Scales size of the tree ( / 50 = meter) + U8 branches; // When tree forks, how many branches emerge? + U8 twist; // twist about old branch axis for each branch (convert to degrees by dividing/255 * 180) + U8 droop; // Droop away from old branch axis (convert to degrees by dividing/255 * 180) + U8 species; // Branch coloring index + U8 trunk_depth; // max recursions in the main trunk + U8 branch_thickness; // Scales thickness of trunk ( / 50 = meter) + U8 max_depth; // Branch Recursions to flower + U8 scale_step; // How much to multiply scale size at each recursion 0-1.f to convert to float +}; + +#endif diff --git a/indra/llprimitive/object_flags.h b/indra/llprimitive/object_flags.h new file mode 100644 index 0000000000..b410171742 --- /dev/null +++ b/indra/llprimitive/object_flags.h @@ -0,0 +1,61 @@ +/** + * @file object_flags.h + * @brief Flags for object creation and transmission + * + * Copyright (c) 2001-$CurrentYear$, Linden Research, Inc. + * $License$ + */ + +#ifndef LL_OBJECT_FLAGS_H +#define LL_OBJECT_FLAGS_H + +// downstream flags from sim->viewer +const U32 FLAGS_USE_PHYSICS = 0x00000001; +const U32 FLAGS_CREATE_SELECTED = 0x00000002; +const U32 FLAGS_OBJECT_MODIFY = 0x00000004; +const U32 FLAGS_OBJECT_COPY = 0x00000008; +const U32 FLAGS_OBJECT_ANY_OWNER = 0x00000010; +const U32 FLAGS_OBJECT_YOU_OWNER = 0x00000020; +const U32 FLAGS_SCRIPTED = 0x00000040; +const U32 FLAGS_HANDLE_TOUCH = 0x00000080; +const U32 FLAGS_OBJECT_MOVE = 0x00000100; +const U32 FLAGS_TAKES_MONEY = 0x00000200; +const U32 FLAGS_PHANTOM = 0x00000400; +const U32 FLAGS_INVENTORY_EMPTY = 0x00000800; + +const U32 FLAGS_JOINT_HINGE = 0x00001000; +const U32 FLAGS_JOINT_P2P = 0x00002000; +const U32 FLAGS_JOINT_LP2P = 0x00004000; +//const U32 FLAGS_JOINT_WHEEL = 0x00008000; + +const U32 FLAGS_ALLOW_INVENTORY_DROP = 0x00010000; +const U32 FLAGS_OBJECT_TRANSFER = 0x00020000; +const U32 FLAGS_OBJECT_GROUP_OWNED = 0x00040000; +//const U32 FLAGS_OBJECT_YOU_OFFICER = 0x00080000; + +const U32 FLAGS_CAMERA_DECOUPLED = 0x00100000; +const U32 FLAGS_ANIM_SOURCE = 0x00200000; +const U32 FLAGS_CAMERA_SOURCE = 0x00400000; + +const U32 FLAGS_CAST_SHADOWS = 0x00800000; + +const U32 FLAGS_OBJECT_OWNER_MODIFY = 0x10000000; + +const U32 FLAGS_TEMPORARY_ON_REZ = 0x20000000; +const U32 FLAGS_TEMPORARY = 0x40000000; +const U32 FLAGS_ZLIB_COMPRESSED = 0x80000000; + +const U32 FLAGS_LOCAL = FLAGS_ANIM_SOURCE | FLAGS_CAMERA_SOURCE; + +typedef enum e_havok_joint_type +{ + HJT_INVALID = 0, + HJT_HINGE = 1, + HJT_POINT = 2, +// HJT_LPOINT = 3, +// HJT_WHEEL = 4, + HJT_EOF = 3 +} EHavokJointType; + +#endif + -- cgit v1.2.3